summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed issue with button color when no CI enabledmerge-button-color-fixPhil Hughes2016-05-252-3/+4
* Merge branch 'plural-second-slack' into 'master' Jeroen van Baarsen2016-05-253-6/+22
|\
| * Seconds plural slackAran Koning2016-05-243-6/+22
* | Merge branch 'master' into 'master' Stan Hu2016-05-240-0/+0
|\ \
| * | Update health_check.md - Fix spelling of admin/health_check path. [ci skip]Ryan Rustong2016-05-241-1/+1
| |/
* | Merge branch 'snippets-ui' into 'master' Jacob Schatz2016-05-2410-59/+122
|\ \
| * | Updated snippets testssnippets-uiPhil Hughes2016-05-192-4/+4
| * | Updated snippets UIPhil Hughes2016-05-188-55/+118
* | | Merge branch 'project-settings' into 'master' Jacob Schatz2016-05-247-324/+274
|\ \ \
| * | | Fixed project settings testsproject-settingsPhil Hughes2016-05-201-1/+1
| * | | Project settings UI updatePhil Hughes2016-05-206-323/+273
* | | | Merge branch 'scroll-to-changes-content' into 'master' Jacob Schatz2016-05-241-0/+3
|\ \ \ \
| * | | | Clicking changes tab scrolls the window to show the contentscroll-to-changes-contentPhil Hughes2016-05-181-0/+3
* | | | | Merge branch 'patch-2' into 'master' Robert Speicher2016-05-241-1/+1
|\ \ \ \ \
| * | | | | Update branch name from 8-7-stable to 8-8-stableFlorian Preinstorfer2016-05-241-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_typo_on_monitoring_help_page' into 'master' Robert Speicher2016-05-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fixing typo in link #17809sebastian-schmid2016-05-241-1/+1
|/ / / /
* | | | Merge branch 'gitlab-shell-changelog' into 'master' Stan Hu2016-05-241-0/+1
|\ \ \ \
| * | | | Add CHANGELOG entry about using gitlab-shell v3.0.0Stan Hu2016-05-241-0/+1
* | | | | Merge branch 'gitlab-shell-v3.0.0' into 'master' Stan Hu2016-05-241-1/+1
|\ \ \ \ \
| * | | | | Use gitlab-shell 3.0.0Jacob Vosmaer2016-05-231-1/+1
* | | | | | Merge branch 'mrchrisw/google-api' into 'master' Achilleas Pipinellis2016-05-241-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update Google integration API workflowmrchrisw/google-apiChris Wilson2016-05-231-2/+2
* | | | | | Merge branch 'project-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-2339-361/+402
|\ \ \ \ \ \
| * | | | | | Move files tab before commits tab to follow same order as top navigationproject-navigation-redesignDmitriy Zaporozhets2016-05-241-3/+3
| * | | | | | Fix badge count UI for pipelines menu itemDmitriy Zaporozhets2016-05-241-1/+1
| * | | | | | Use start_with? instead of regexDmitriy Zaporozhets2016-05-241-1/+1
| * | | | | | Add changelog item for project navigation UIDmitriy Zaporozhets2016-05-231-0/+1
| * | | | | | Merge branch 'master' into project-navigation-redesignDmitriy Zaporozhets2016-05-23517-1221/+10490
| |\ \ \ \ \ \
| * | | | | | | Change rgba to hex; use sass variables to calculate header heightAnnabel Dunstone2016-05-232-2/+2
| * | | | | | | Redesign sublevel nav links; vertically align project image; fix spacingAnnabel Dunstone2016-05-192-6/+10
| * | | | | | | Fix alignment of repo buttonsAnnabel Dunstone2016-05-191-1/+1
| * | | | | | | Redesign project page headerAnnabel Dunstone2016-05-1912-119/+208
| * | | | | | | Fix dashboard shortcutsDmitriy Zaporozhets2016-05-173-9/+9
| * | | | | | | Fix file browsing testDmitriy Zaporozhets2016-05-161-7/+9
| * | | | | | | Fix shortcuts testsDmitriy Zaporozhets2016-05-163-1/+3
| * | | | | | | Modify tests to match new navigation behaviour for project pagesDmitriy Zaporozhets2016-05-1614-86/+82
| * | | | | | | Fix spec for new project navigationDmitriy Zaporozhets2016-05-162-5/+2
| * | | | | | | Implement new horizontal navigation to project pagesDmitriy Zaporozhets2016-05-168-128/+78
* | | | | | | | Merge branch 'rs-rubocop-rspec' into 'master' Dmitriy Zaporozhets2016-05-234-0/+69
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add descriptive comments for rubocop-rspec copsRobert Speicher2016-05-231-0/+14
| * | | | | | | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-234-0/+55
* | | | | | | | Merge branch 'version-bump-8-9-pre' into 'master' Robert Speicher2016-05-232-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Its time for 8.9Dmitriy Zaporozhets2016-05-232-1/+3
* | | | | | | | Merge branch 'complexity/enable-multiple-rubocop-cops' into 'master' Robert Speicher2016-05-231-34/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Enabled multiple Rubocop cops that can be enabledGrzegorz Bizon2016-05-231-34/+31
* | | | | | | | | Merge branch 'rs-space-around-keyword' into 'master' Robert Speicher2016-05-237-9/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-237-9/+7
* | | | | | | | | | Merge branch 'rs-update-rubocop' into 'master' Robert Speicher2016-05-233-9/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update rubocop to 0.40.0Robert Speicher2016-05-233-9/+27
| |/ / / / / / / /