summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-1333-370/+386
* Merge branch 'rubocop/space-around-operators' into 'master' Robert Speicher2016-05-1334-80/+80
|\
| * remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
| * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-1333-77/+77
| * Require space around operatorsGabriel Mazetto2016-05-131-2/+2
* | 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
* | | | Merge branch 'dz-fix-issue-sidebar' into 'master' Dmitriy Zaporozhets2016-05-133-4/+4
|\ \ \ \
| * | | | Fix login btn vertical alignDmitriy Zaporozhets2016-05-131-1/+1
| * | | | Fix issue sidebar top position after header height changeDmitriy Zaporozhets2016-05-132-3/+3
* | | | | Merge branch 'dz-update-changelog' into 'master' Robert Speicher2016-05-131-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add UI changes in 8.8 to changelogdz-update-changelogDmitriy Zaporozhets2016-05-131-0/+2
| |/ / /
* | | | Merge branch 'dz-improve-sidebar-design' into 'master' Dmitriy Zaporozhets2016-05-131-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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-122-2/+2
|\ \ \
| * | | Fix minor typos in admin health check pageDrew Blessing2016-05-122-2/+2
* | | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \ \
| * | | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
* | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-1210-14/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-0810-14/+14
* | | | | 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