summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix a description for default scope on buildsTakuya Noguchi2016-05-132-2/+2
* | | | | | Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-121-0/+6
|\ \ \ \ \ \
| * | | | | | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-121-0/+6
* | | | | | | Merge branch 'health-check-route'Douwe Maan2016-05-126-0/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add Changelog entryhealth-check-routeDJ Mountney2016-05-122-11/+7
| * | | | | | Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-112-18/+33
| * | | | | | Add tests for the health check featureDJ Mountney2016-05-101-0/+3
| * | | | | | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-106-0/+79
* | | | | | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-127-3/+53
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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
| * | | | | | 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 "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
| * | | | | | On Application Settings Page let the user select the enabled OAuth Sign in so...Andrei Gliga2016-05-123-13/+13
| * | | | | | 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
| * | | | | | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-121-0/+10
| * | | | | | 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
| * | | | | | method to get the enabled_button_based_providersAndrei Gliga2016-05-121-0/+6
| * | | | | | OAuth Providers disable from the ApplicationSettings pageAndrei Gliga2016-05-122-0/+25
| * | | | | | default value for disabled_oauth_sign_in_sources in create_from_defaults @ Ap...Andrei Gliga2016-05-121-0/+1
| * | | | | | disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsContr...Andrei Gliga2016-05-121-1/+11
| * | | | | | serialize the disabled_oauth_sign_in_sourcesAndrei Gliga2016-05-121-0/+50
* | | | | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-124-11/+33
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix specssend-incremental-build-logKamil Trzcinski2016-05-121-1/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-10103-1747/+158
| |\ \ \ \ \ \
| * | | | | | | Encode state as base64 stringKamil Trzcinski2016-05-093-18/+18
| * | | | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-093-4/+26
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '14272-forks-listed-when-permission-is-missing' into 'master' Rémy Coutable2016-05-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Only show forks for users who can download codeSean McGivern2016-05-121-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-126-47/+33
|\ \ \ \ \ \ \
| * | | | | | | Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-areaGrzegorz Bizon2016-05-111-2/+2
| * | | | | | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-103-2/+3
| * | | | | | | Reuse runners edit form in admin and project areaGrzegorz Bizon2016-05-103-44/+29
* | | | | | | | Merge branch '3870-commit-sorting-issue' into 'master' Rémy Coutable2016-05-121-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Group commits by date in server timezone3870-commit-sorting-issueSean McGivern2016-05-111-1/+1
* | | | | | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-114-2/+37
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-11105-1750/+165
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
View Lorry Controller Status