summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert CHANGELOGretry-spinach-testsKamil Trzcinski2016-06-131-1/+0
* Use bundle exec to run spinachKamil Trzcinski2016-06-101-1/+1
* Merge remote-tracking branch 'origin/master' into retry-spinach-testsKamil Trzcinski2016-06-10570-1175/+2976
|\
| * Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-102-11/+93
| |\
| | * Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-102-11/+93
| * | Merge branch 'changelog-search-arrow-keys' into 'master' Robert Speicher2016-06-101-1/+1
| |\ \
| | * | Changelog fix for search dropdown arrow keys fixchangelog-search-arrow-keysPhil Hughes2016-06-101-1/+1
| * | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in...Robert Speicher2016-06-101-8/+0
| |\ \ \
| | * | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
| * | | | Merge branch 'labels-placement' into 'master' Dmitriy Zaporozhets2016-06-1011-105/+127
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add CHANGELOG item for labels/milestones navigation changeDmitriy Zaporozhets2016-06-101-0/+1
| | * | | Render issues link on issues subnav unless you visit merge request controllerDmitriy Zaporozhets2016-06-101-1/+1
| | * | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-105-17/+21
| | * | | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-107-90/+107
| * | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-1014-34/+61
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| | * | | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10175-950/+2237
| | |\ \ \ | | | |/ /
| | * | | Add send_git_diff helperDouwe Maan2016-06-08231-2052/+5316
| | |\ \ \
| | * | | | Move changelog itemDouwe Maan2016-06-061-1/+1
| | * | | | Add changelog itemDouwe Maan2016-06-061-0/+1
| | * | | | Add workhorse controller and API helpersDouwe Maan2016-06-0612-24/+45
| * | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-1016-247/+305
| |\ \ \ \ \
| | * | | | | Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
| | * | | | | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| | * | | | | Fixed failing testsPhil Hughes2016-06-101-2/+4
| | * | | | | CI build page UI updatePhil Hughes2016-06-1016-250/+306
| * | | | | | Merge branch 'icon-color-fix' into 'master' Jacob Schatz2016-06-102-8/+8
| |\ \ \ \ \ \
| | * | | | | | Update activity SVG pathicon-color-fixAnnabel Dunstone2016-06-092-8/+8
| * | | | | | | Merge branch 'prettier-awardable-button-active' into 'master' Jacob Schatz2016-06-101-1/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Made the awardable buttons prettier when activeprettier-awardable-button-activePhil Hughes2016-06-101-1/+9
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'label-create-error-messages' into 'master' Jacob Schatz2016-06-101-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Correctly shows label errors in dropdownlabel-create-error-messagesPhil Hughes2016-06-101-1/+4
| | |/ / / / / /
| * | | | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-102-40/+4
| |\ \ \ \ \ \ \
| | * | | | | | | removed tests needed for any author :poop:user-search-dropdownPhil Hughes2016-06-101-36/+0
| | * | | | | | | Revert change to search all usersPhil Hughes2016-06-101-4/+4
| | |/ / / / / /
| * | | | | | | Merge branch 'project-dropdown-position-fix' into 'master' Jacob Schatz2016-06-101-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed project dropdown being overlapped by sidebarproject-dropdown-position-fixPhil Hughes2016-06-101-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-104-4/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Added testslabel-filter-fixPhil Hughes2016-06-093-3/+18
| | * | | | | | | Fixed issue where label filtering didnt workPhil Hughes2016-06-091-1/+1
| * | | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-105-5/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-10410-336/+915
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Fix expose of TriggerRequestKamil Trzcinski2016-06-101-1/+1
| | * | | | | | | | Fix CI TriggerRequest entityrename-ci-commit-phase-4Kamil Trzcinski2016-06-091-1/+1
| | * | | | | | | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-094-4/+4
| * | | | | | | | | Merge branch 'fix-registry-docs' into 'master' Achilleas Pipinellis2016-06-102-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix incorrect registry key valueAchilleas Pipinellis2016-06-102-3/+3
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '18027-cache-project-external_issue_tracker' into 'master' Yorick Peterse2016-06-1010-7/+137
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixing specs stubbed objects cannot access databasePaco Guzman2016-06-103-4/+4
| | * | | | | | | | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-107-3/+133
| |/ / / / / / / / /