summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-1327-359/+366
* Merge branch 'rubocop/space-around-operators' into 'master' Robert Speicher2016-05-139-10/+10
|\
| * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-139-10/+10
* | Merge branch '17338-sidebar-width' into 'master' Dmitriy Zaporozhets2016-05-132-2/+2
|\ \
| * | Undo changes; reduce sidebar internal width17338-sidebar-widthAnnabel Dunstone2016-05-121-9/+4
| * | No extra link padding at xs screen sizeAnnabel Dunstone2016-05-101-2/+4
| * | Reduce width of side navAnnabel Dunstone2016-05-102-5/+8
* | | Merge branch '17501-dropdown-bug' into 'master' Dmitriy Zaporozhets2016-05-134-2/+29
|\ \ \
| * | | Fix mobile dropdown bugAnnabel Dunstone2016-05-134-2/+29
* | | | Fix login btn vertical alignDmitriy Zaporozhets2016-05-131-1/+1
* | | | Fix issue sidebar top position after header height changeDmitriy Zaporozhets2016-05-132-3/+3
* | | | Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-designDmitriy Zaporozhets2016-05-131-4/+1
|/ / /
* | | Merge branch '17485-broadcast-msg' into 'master' Dmitriy Zaporozhets2016-05-131-1/+1
|\ \ \ | |_|/ |/| |
| * | Move broadcast msg into content-wrapper17485-broadcast-msgAnnabel Dunstone2016-05-121-1/+1
* | | Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-121-1/+1
|\ \ \
| * | | Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
* | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
* | | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \
| * | | | 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