Commit Graph

382 Commits

Author SHA1 Message Date
Bob Van Landuyt 619021fd7a Read circuitbreaker settings from `Gitlab::CurrentSettings`
Instead of from the configuration file
2017-10-17 11:50:32 +02:00
Nick Thomas ce87f42dc9 Merge branch '34102-online-view-of-artifacts-fe' into 'master'
Add external link for online artifacts

Closes #34102

See merge request gitlab-org/gitlab-ce!14399
2017-10-05 15:03:17 +00:00
Eric Eastwood decf044369 Merge branch 'master' into 34102-online-view-of-artifacts-fe 2017-10-04 10:56:03 -05:00
Jacob Vosmaer 147e2b21be Let fetch_ref pull from Gitaly instead of from disk 2017-10-04 12:57:41 +02:00
Zeger-Jan van de Weg ca0e39048f
Backend for HTML serving with GitLab Pages 2017-10-02 16:25:52 +02:00
Guilherme Vieira 4e4a29ad75 Add "implements" to the default issue closing message regex 2017-10-02 12:02:38 +00:00
Daniel Voogsgerd f4c45417fe Removed two legacy config options
Removed the max_size and timeout options from the git config in
gitlab.yml.
2017-09-21 22:04:49 -04:00
Annabel Dunstone Gray 9b177bb7c9 Revert "Merge branch 'revert-f2421b2b' into 'master'"
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
Rubén Dávila 52a2423e37 Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"
This reverts merge request !13619
2017-09-08 14:48:44 +00:00
Annabel Dunstone Gray 7b567597ee Fix specs; start on light theme 2017-09-06 12:57:30 -05:00
Annabel Dunstone Gray c3ac731152 Add blue theme 2017-09-06 12:54:09 -05:00
Annabel Dunstone Gray 3c815f97d3 Add functionality for two themes 2017-09-06 12:54:09 -05:00
Rubén Dávila 6c49a62800 Restore some changes from !9199 2017-09-06 12:54:09 -05:00
Alexander Keramidas 4df54f2607 Profile updates from providers 2017-09-06 16:38:52 +03:00
Bob Van Landuyt d3ca6c0f25 Increase the timeout before aborting a storage access attempt
There are peaks of IO-wait time, most of them stay below 30 seconds.
2017-09-04 14:03:41 +02:00
Michael Kozono dd3e7ff036 Default LDAP config verify_certificates to true 2017-08-30 11:27:01 -07:00
Bob Van Landuyt 93d56eb2a5 Use better higher threshold settings for storage access in tests
`failure_count_threshold`: We should never need this, but we don't
want to block access in tests because of this.

`failure_wait_time`: Setting it to 0 now allows each storage attempt

`storage_timeout`: Try a bit longer to access storage on CI in case
the slow machines take a bit longer to spin up the process to perfom
the check
2017-08-16 14:15:50 +02:00
Paweł Chojnacki 746f0ec367 Add sidekiq metrics endpoint and add http server to sidekiq 2017-08-07 17:13:02 +00:00
Bob Van Landuyt 3598e60bf2 Add a Circuitbreaker for storage paths 2017-08-04 15:38:48 +02:00
Michael Kozono 7b5a96b53c Fix LDAP documentation and example config 2017-07-31 08:43:27 -07:00
Michael Kozono 26ee3a2802 Mention how to test LDAP connections 2017-07-26 02:43:41 -07:00
Michael Kozono 951bd2a431 Update more examples 2017-07-26 02:43:40 -07:00
Michael Kozono e0fe34778d Copy comment improvements from documentation 2017-07-26 02:43:38 -07:00
Michael Kozono 6dbff9663d Add LDAP config options 2017-07-26 02:43:32 -07:00
Rémy Coutable 0579a89fb9 Merge branch 'authentiq-updates' into 'master'
Added authentiq provider to tests and updated documentation, gem and config file.

See merge request !12952
2017-07-19 12:16:58 +00:00
Alexandros Keramidas 6bd94f20e3 Added authentiq provider to tests and updated documentation, gem and config file. 2017-07-18 00:12:50 +03:00
Sean McGivern 25d241ae97 Merge branch '33949-remove-healthcheck-access-token' into 'master'
Remove the need to use health check token by adding ability to whitelist hosts

Closes #33949

See merge request !12612
2017-07-11 08:51:27 +00:00
Douwe Maan c5e11d0405 Merge branch '34737-authentiq-oauth-feature-spec' into 'master'
Test logging in via the Authentiq OAuth provider in a feature spec

Closes #34737

See merge request !12694
2017-07-07 17:09:58 +00:00
Sean McGivern 5c0d8d59ff Merge branch 'gitaly-mandatory' into 'master'
Remove option to disable Gitaly in Rails

See merge request !12677
2017-07-07 12:30:31 +00:00
Jacob Vosmaer 78089d1153 Remove option to disable Gitaly completely 2017-07-07 12:48:34 +02:00
Timothy Andrew d53690b6e5 Test logging in via the Authentiq OAuth provider in a feature spec.
- The `migration:path-pg` build was previously failing when the Authentiq
  feature spec was enabled by placing Authentiq configuration in the `test`
  section of `gitlab.yml`

- The `migration:path-pg` task checks out an old revision of the
  codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit
  under test, and runs `db:migrate`, to verify that migrations run without
  errors.

- The problem here is that `v8.14.10` does not have the Authentiq module
  installed, but is run with the `gitlab.yml` for `master`, which would contain
  the `Authentiq` configuration in the `test` section.

- The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`,
  rather than the `gitlab.yml` from master.
2017-07-07 04:54:30 +00:00
Douwe Maan a33fb2132c Merge branch '18000-remember-me-for-oauth-login' into 'master'
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login"

Closes #34713

See merge request !12668
2017-07-06 12:59:21 +00:00
Timothy Andrew 89b0c987fc Remove Authentiq from the OAuth login integration tests.
- This is causing autoload-related errors in the `migration:path` builds. We
  need to find a better way of testing this provider.
2017-07-06 06:30:08 +00:00
Timothy Andrew 7c2f5bb48d Fix build for !11963.
- Don't use `request.env['omniauth.params']` if it isn't present.

- Remove the `saml` section from the `gitlab.yml` test section. Some tests
  depend on this section not being initially present, so it can be overridden
  in the test. This MR doesn't add any tests for SAML, so we didn't really need
  this in the first place anyway.

- Clean up the test -> omniauth section of `gitlab.yml`
2017-07-06 06:30:07 +00:00
Timothy Andrew 15dba34c9a Add Omniauth OAuth config to the test section of `gitlab.yml`
- I tried to get this to work by stubbing out portions of the config within the
  test. This didn't work as expected because Devise/Omniauth loaded before the
  stub could run, and the stubbed config was ignored.

- I attempted to fix this by reloading Devise/Omniauth after stubbing the
  config. This successfully got Devise to load the stubbed providers, but failed
  while trying to access a route such as `user_gitlab_omniauth_authorize_path`.

- I spent a while trying to figure this out (even trying
  `Rails.application.reload_routes!`), but nothing seemed to work.

- I settled for adding this config directly to `gitlab.yml` rather than go down
  this path any further.
2017-07-06 06:30:06 +00:00
Sean McGivern 8a3022a698 Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"
This reverts merge request !11963
2017-07-05 16:01:40 +00:00
Sean McGivern 6df61942e9 Merge branch '18000-remember-me-for-oauth-login' into 'master'
Honor the "Remember me" parameter for OAuth-based login

Closes #18000

See merge request !11963
2017-07-05 12:41:06 +00:00
Pawel Chojnacki 1eca48819a Merge prometheus unicorn sampler settigns within monitoring settings 2017-07-05 00:51:01 +02:00
Pawel Chojnacki c1b043bdb7 Bring back healthcheck token access to monitoring resources, but mark this as deprecated 2017-07-05 00:46:11 +02:00
Pawel Chojnacki 18521584bd Remove the need to use health check token
in favor of whitelist that will be used to
control the access to monitoring resources
2017-07-05 00:46:11 +02:00
Paweł Chojnacki 26ac691a68 Instrument Unicorn with Ruby exporter 2017-07-04 15:28:34 +00:00
Timothy Andrew 9a0f5bd55b Fix build for !11963.
- Don't use `request.env['omniauth.params']` if it isn't present.

- Remove the `saml` section from the `gitlab.yml` test section. Some tests
  depend on this section not being initially present, so it can be overridden
  in the test. This MR doesn't add any tests for SAML, so we didn't really need
  this in the first place anyway.

- Clean up the test -> omniauth section of `gitlab.yml`
2017-07-03 19:37:37 +00:00
Timothy Andrew a931ead00c Add Omniauth OAuth config to the test section of `gitlab.yml`
- I tried to get this to work by stubbing out portions of the config within the
  test. This didn't work as expected because Devise/Omniauth loaded before the
  stub could run, and the stubbed config was ignored.

- I attempted to fix this by reloading Devise/Omniauth after stubbing the
  config. This successfully got Devise to load the stubbed providers, but failed
  while trying to access a route such as `user_gitlab_omniauth_authorize_path`.

- I spent a while trying to figure this out (even trying
  `Rails.application.reload_routes!`), but nothing seemed to work.

- I settled for adding this config directly to `gitlab.yml` rather than go down
  this path any further.
2017-07-03 16:25:10 +00:00
Jacob Vosmaer 218da88e1a Enable gitaly token auth when testing 2017-06-20 17:42:54 +02:00
Jacob Vosmaer 4f8af50b61 Rubocop and comment fixes 2017-06-20 17:31:49 +02:00
Jacob Vosmaer 76bafc00e6 Pass Gitaly token on Ruby gRPC requests 2017-06-19 11:07:46 +02:00
Robin Bobbitt 469acd190e Sync email address from specified omniauth provider 2017-06-07 11:13:57 -04:00
Sean McGivern 97d6085fb5 Merge branch 'dm-gravatar-username' into 'master'
Add username parameter to gravatar URL

Closes #24472

See merge request !11741
2017-06-01 17:19:17 +00:00
Douwe Maan dcd002a15b Add username parameter to gravatar URL 2017-06-01 10:07:24 -05:00
Jacob Vosmaer 28590e8854 Enable Gitaly by default in GitLab 9.3 2017-05-30 16:09:44 +02:00