summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-164-33/+53
* Merge branch 'patch-20' into 'master' Rémy Coutable2017-05-162-2/+6
|\
| * #32340 - Include mention of "manual" scope in jobs api docZac Sturgess2017-05-162-2/+6
|/
* Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-1625-121/+125
|\
| * Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-1625-121/+125
* | Merge branch 'docs-add-more-conventions-for-docs-only-tests' into 'master' Rémy Coutable2017-05-162-8/+15
|\ \
| * | Add more choices to name the branch for docs only testsAchilleas Pipinellis2017-05-162-8/+15
* | | Merge branch 'pms-uxguide-monospace-git-refs' into 'master' Achilleas Pipinellis2017-05-161-1/+1
|\ \ \
| * | | Update UX guide to use monospace type for commit, branch, and tag refspms-uxguide-monospace-git-refsPedro Moreira da Silva2017-05-151-1/+1
* | | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-162-2/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed Regex(es)Tim Zallmann2017-05-111-2/+2
| * | | Fixing Static Analysis Fail with IndentationTim Zallmann2017-05-081-2/+1
| * | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-082-2/+21
| * | | Merge remote-tracking branch 'origin/31386-profile-fix-externallinks' into 31...Tim Zallmann2017-05-080-0/+0
| |\ \ \
| | * | | Doing the commit again with the correct E-Mail address setup31386-profile-fix-externallinksTim Zallmann2017-04-261-2/+2
| | * | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-04-261-2/+2
| * | | | Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
| * | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
* | | | | Merge branch 'ee_compat_check-include-git-apply-reject-suggestion' into 'mast...Rémy Coutable2017-05-161-0/+11
|\ \ \ \ \
| * | | | | Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett2017-05-161-0/+11
|/ / / / /
* | | | | Merge branch '30827-changes-to-audit-log' into 'master' Phil Hughes2017-05-169-12/+17
|\ \ \ \ \
| * | | | | Rename Personal Audit LogTim Zallmann2017-05-169-12/+17
|/ / / / /
* | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-162-1/+5
|\ \ \ \ \
| * | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
* | | | | | Merge branch '32033-fix-login-usernamelabel' into 'master' Tim Zallmann2017-05-162-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Resolve ""Username or email" label on login form does not point to its corres...Tim Zallmann2017-05-162-3/+3
|/ / / / /
* | | | | Merge branch 'winh-autocomplete-error' into 'master' Phil Hughes2017-05-165-54/+76
|\ \ \ \ \
| * | | | | Replace broken autocomplete field for new tags with dropdownWinnie Hellmann2017-05-165-54/+76
|/ / / / /
* | | | | Merge branch '32303-nav-z-index' into 'master' Fatih Acet2017-05-161-0/+1
|\ \ \ \ \
| * | | | | Add higher z-index to fixed nav32303-nav-z-indexAnnabel Dunstone Gray2017-05-151-0/+1
* | | | | | Merge branch 'spec-joining-it' into 'master' Rémy Coutable2017-05-164-30/+46
|\ \ \ \ \ \
| * | | | | | [Spec optimization] Joining one-line 'it' blocksspec-joining-itValery Sizov2017-05-154-30/+46
* | | | | | | Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet2017-05-164-62/+91
|\ \ \ \ \ \ \
| * | | | | | | Fix linking to resolved note in diff32125-fix-link-to-note-in-diffEric Eastwood2017-05-124-62/+91
* | | | | | | | Merge branch 'zj-pipeline-schedule-owner' into 'master' Kamil Trzciński2017-05-167-21/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Add foreign key on pipeline_schedules.owner_idzj-pipeline-schedule-ownerZ.J. van de Weg2017-05-152-1/+37
| * | | | | | | | Do not schedule pipelines if the user can'tZ.J. van de Weg2017-05-155-20/+55
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-c...Kamil Trzciński2017-05-163-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | alter cache key to prevent other pipeline configs from overwriting32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cacheMike Greiling2017-05-161-1/+1
| * | | | | | | | add CHANGELOG.md entry for !11343Mike Greiling2017-05-161-0/+4
| * | | | | | | | add trailing slash to .yarn-cache to clearly identify it as a directoryMike Greiling2017-05-161-1/+1
| * | | | | | | | instruct yarn to utilize the persistant .yarn-cache directoryMike Greiling2017-05-162-2/+5
* | | | | | | | | Merge branch '24373-warning-message-go-away' into 'master' Phil Hughes2017-05-163-3/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Notes: Warning message should go away once resolvedJacopo2017-05-153-3/+49
* | | | | | | | | | Merge branch '32231-fix-transient-failure-of-deployment-query-spec' into 'mas...Robert Speicher2017-05-161-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Due to DB rounding timestamp to 1s resolution - freeze date on non fractional...Pawel Chojnacki2017-05-151-10/+11
* | | | | | | | | | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-05-162-1/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed tests with params being wrongissue-boards-label-filteringPhil Hughes2017-05-151-1/+4
| * | | | | | | | | | | Fixed issue boards not filtering when URL params are encodedPhil Hughes2017-05-122-1/+11
* | | | | | | | | | | | Merge branch '31898-pipeline-table-alignment' into 'master' Filipa Lacerda2017-05-161-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \