summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-125-2/+5
|\
| * Fix a description for default scope on buildsTakuya Noguchi2016-05-135-2/+5
* | Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-1213-77/+261
|\ \
| * | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-1213-77/+261
* | | Merge branch 'health-check-route'Douwe Maan2016-05-1217-1/+292
|\ \ \ | |/ / |/| |
| * | Add Changelog entryhealth-check-routeDJ Mountney2016-05-123-11/+8
| * | Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-115-20/+50
| * | Add tests for the health check featureDJ Mountney2016-05-105-0/+165
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-109-2/+89
| * | Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
| * | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-104-0/+37
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-1214-4/+130
|\ \ \
| * | | schema fix 😓Andrei Gliga2016-05-121-9/+9
| * | | no need to define the help block since there's no help blockAndrei Gliga2016-05-122-4/+3
| * | | Revert "Revert "no need to show the help about Github or the other authentica...Andrei Gliga2016-05-122-11/+1
| * | | Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign I...Andrei Gliga2016-05-121-0/+0
| * | | delete the enabled_oauth_sign_in_sources after getting it's value into enable...Andrei Gliga2016-05-121-3/+1
| * | | no schema info for ApplicationSettingAndrei Gliga2016-05-121-49/+0
| * | | Revert "disabled_oauth_sign_in_sources column" and keep on schema only the di...Andrei Gliga2016-05-121-9/+9
| * | | new screenshot for the docs on how to enabled/disable OmniAuth Sign InAndrei Gliga2016-05-121-0/+0
| * | | config/gitlab.yml between ``Andrei Gliga2016-05-121-1/+1
| * | | Revert "no need to show the help about Github or the other authentication sou...Andrei Gliga2016-05-122-1/+11
| * | | inline btn-group{ data: { toggle: 'buttons' } }Andrei Gliga2016-05-121-2/+1
| * | | << instead of +=Andrei Gliga2016-05-121-1/+1
| * | | enabled_button_based_providers.any? instead of ! empty? for button_based_prov...Andrei Gliga2016-05-121-1/+1
| * | | button_based_providers.any? instead of !button_based_providers.empty?Andrei Gliga2016-05-121-1/+1
| * | | Array(enabled_oauth_sign_in_sources) instead of the ifAndrei Gliga2016-05-121-1/+1
| * | | enabled_oauth_sign_in_sources param doesn't need permitAndrei Gliga2016-05-121-1/+0
| * | | credits for !4034Andrei Gliga2016-05-121-2/+1
| * | | corrections to the Enable or disable Sign In with OmniAuthAndrei Gliga2016-05-121-2/+3
| * | | documentation for enabling or disabling OAuth sign inAndrei Gliga2016-05-122-0/+14
| * | | Allow Admins to remove the Login with buttons for OAuth services and still be...Andrei Gliga2016-05-121-0/+2
| * | | On Application Settings Page let the user select the enabled OAuth Sign in so...Andrei Gliga2016-05-123-13/+13
| * | | more readable specs for enabled_button_based_providers and button_based_provi...Andrei Gliga2016-05-121-15/+29
| * | | typoAndrei Gliga2016-05-121-1/+1
| * | | unindent 1 level the Disable OAuth formAndrei Gliga2016-05-121-8/+8
| * | | no need to show the help about Github or the other authentication sourcesAndrei Gliga2016-05-121-3/+0
| * | | if omniauth is enabled and if there are button_based_providers available show...Andrei Gliga2016-05-121-10/+11
| * | | DRYing enabled_button_based_providers testsAndrei Gliga2016-05-121-7/+4
| * | | enabled_button_based_providers into their own describe sectionAndrei Gliga2016-05-121-0/+2
| * | | use stub_application_setting insteadAndrei Gliga2016-05-121-10/+4
| * | | between ""Andrei Gliga2016-05-121-1/+1
| * | | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no...Andrei Gliga2016-05-121-2/+8
| * | | tests for button_based_providers_enabled? helper method of AuthHelperAndrei Gliga2016-05-121-0/+18
| * | | tests for enabled_button_based_providers helper method of AuthHelperAndrei Gliga2016-05-121-1/+21
| * | | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-122-0/+13
| * | | text for the disable_oauth_signin_sources labelAndrei Gliga2016-05-121-1/+1
| * | | show only the eanbled oauth providersAndrei Gliga2016-05-121-1/+1
| * | | render the omniauth_box if there are any button_based_providersAndrei Gliga2016-05-121-1/+1
| * | | method to check if oauth button based providers are enabledAndrei Gliga2016-05-121-0/+4