| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove extra space to fix codestylerubocop/space-around-operators | Gabriel Mazetto | 2016-05-13 | 1 | -1/+1 |
| | | |||||
| * | Codestyle: make sure we have space around operators | Gabriel Mazetto | 2016-05-13 | 33 | -77/+77 |
| | | |||||
| * | Require space around operators | Gabriel Mazetto | 2016-05-13 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'fix_health_check_type' into 'master' | Douwe Maan | 2016-05-12 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | Fix minor typos in admin health check page Fix minor typos from gitlab-org/gitlab-ce!3888 cc/ @DouweM @twk3 See merge request !4134 | ||||
| | * | Fix minor typos in admin health check page | Drew Blessing | 2016-05-12 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' | Douwe Maan | 2016-05-12 | 1 | -47/+48 |
| |\ \ | | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133 | ||||
| | * | | Clean up EventsHelper spec | Robert Speicher | 2016-05-12 | 1 | -47/+48 |
| | | | | |||||
| * | | | Merge branch 'deprecated-class-methods-cop' into 'master' | Robert Speicher | 2016-05-12 | 10 | -14/+14 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087 | ||||
| | * | | Enable the Rubocop DeprecatedClassMethods cop | Connor Shea | 2016-05-08 | 10 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. | ||||
| * | | | Merge branch 'default-scope-on-builds-page' into 'master' | Robert Speicher | 2016-05-12 | 5 | -2/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118 | ||||
| | * | | | Fix a description for default scope on builds | Takuya Noguchi | 2016-05-13 | 5 | -2/+5 |
| | | | | | |||||
| * | | | | Merge branch 'feature/label-subscription-api' into 'master' | Douwe Maan | 2016-05-12 | 13 | -77/+261 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoints for un/subscribing from/to a label See merge request !4051 | ||||
| | * | | | | Add API endpoints for un/subscribing from/to a label | Ahmad Sherif | 2016-05-12 | 13 | -77/+261 |
| | | | | | | | | | | | | | | | | | | | | | Closes #15638 | ||||
| * | | | | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 17 | -1/+292 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | Add Changelog entryhealth-check-route | DJ Mountney | 2016-05-12 | 3 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed | ||||
| | * | | | | Support token header for health check token, and general cleanup of the ↵ | DJ Mountney | 2016-05-11 | 5 | -20/+50 |
| | | | | | | | | | | | | | | | | | | | | | health_check feature. | ||||
| | * | | | | Add tests for the health check feature | DJ Mountney | 2016-05-10 | 5 | -0/+165 |
| | | | | | | |||||
| | * | | | | Add health_check access token, and enforce on the health_check endpoint | DJ Mountney | 2016-05-10 | 9 | -2/+89 |
| | | | | | | | | | | | | | | | | | | | | | Also added a health check page to the admin section for resetting the token. | ||||
| | * | | | | Set the standard health_check options to include the cache check. | DJ Mountney | 2016-05-10 | 1 | -28/+3 |
| | | | | | | |||||
| | * | | | | Add the health_check gem end expose the health_check route | DJ Mountney | 2016-05-10 | 4 | -0/+37 |
| | | | | | | |||||
| * | | | | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' | Douwe Maan | 2016-05-12 | 14 | -4/+130 |
| |\ \ \ \ \ | |||||
| | * | | | | | schema fix 😓 | Andrei Gliga | 2016-05-12 | 1 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | no need to define the help block since there's no help block | Andrei Gliga | 2016-05-12 | 2 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | Revert "Revert "no need to show the help about Github or the other ↵ | Andrei Gliga | 2016-05-12 | 2 | -11/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication sources"" This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7. | ||||
| | * | | | | | Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign ↵ | Andrei Gliga | 2016-05-12 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In" [ci skip] This reverts commit 7b295370efc124360d52e37e8e709914028f6443. | ||||
| | * | | | | | delete the enabled_oauth_sign_in_sources after getting it's value into ↵ | Andrei Gliga | 2016-05-12 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled_oauth_sign_in_sources just delete enabled_oauth_sign_in_sources and get it's value | ||||
| | * | | | | | no schema info for ApplicationSetting | Andrei Gliga | 2016-05-12 | 1 | -49/+0 |
| | | | | | | | |||||
| | * | | | | | Revert "disabled_oauth_sign_in_sources column" and keep on schema only the ↵ | Andrei Gliga | 2016-05-12 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled_oauth_sign_in_sources column This reverts commit 95358e0095403ad44149d11922d52e4590285a20. | ||||
| | * | | | | | new screenshot for the docs on how to enabled/disable OmniAuth Sign In | Andrei Gliga | 2016-05-12 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | config/gitlab.yml between `` | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Revert "no need to show the help about Github or the other authentication ↵ | Andrei Gliga | 2016-05-12 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources" This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03. Show help only for the enabled OAuth Providers on oauth-providers-help block aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id provider and not p a more simple approach to the OmniAuth helper links for oauth-providers-help | ||||
| | * | | | | | inline btn-group{ data: { toggle: 'buttons' } } | Andrei Gliga | 2016-05-12 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | << instead of += | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | enabled_button_based_providers.any? instead of ! empty? for ↵ | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | button_based_providers_enabled? | ||||
| | * | | | | | button_based_providers.any? instead of !button_based_providers.empty? | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Array(enabled_oauth_sign_in_sources) instead of the if | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | enabled_oauth_sign_in_sources param doesn't need permit | Andrei Gliga | 2016-05-12 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | credits for !4034 | Andrei Gliga | 2016-05-12 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | corrections to the Enable or disable Sign In with OmniAuth | Andrei Gliga | 2016-05-12 | 1 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | documentation for enabling or disabling OAuth sign in | Andrei Gliga | 2016-05-12 | 2 | -0/+14 |
| | | | | | | | |||||
| | * | | | | | Allow Admins to remove the Login with buttons for OAuth services and still ↵ | Andrei Gliga | 2016-05-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | be able to import on the changelog | ||||
| | * | | | | | On Application Settings Page let the user select the enabled OAuth Sign in ↵ | Andrei Gliga | 2016-05-12 | 3 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | sources instead of the disabled ones | ||||
| | * | | | | | more readable specs for enabled_button_based_providers and ↵ | Andrei Gliga | 2016-05-12 | 1 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | button_based_providers_enabled? | ||||
| | * | | | | | typo | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | unindent 1 level the Disable OAuth form | Andrei Gliga | 2016-05-12 | 1 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | no need to show the help about Github or the other authentication sources | Andrei Gliga | 2016-05-12 | 1 | -3/+0 |
| | | | | | | | |||||
| | * | | | | | if omniauth is enabled and if there are button_based_providers available ↵ | Andrei Gliga | 2016-05-12 | 1 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | show the disable OAuth sources | ||||
| | * | | | | | DRYing enabled_button_based_providers tests | Andrei Gliga | 2016-05-12 | 1 | -7/+4 |
| | | | | | | | |||||
| | * | | | | | enabled_button_based_providers into their own describe section | Andrei Gliga | 2016-05-12 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | use stub_application_setting instead | Andrei Gliga | 2016-05-12 | 1 | -10/+4 |
| | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |