summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'Annabel Dunstone Gray2017-06-151-2/+3
|\
| * Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignmentEric Eastwood2017-06-141-2/+3
* | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-153-3/+4
* | Merge branch '23998-blame-age-map' into 'master'Annabel Dunstone Gray2017-06-155-3/+95
|\ \
| * | Add blame view age mapJeff Stubler2017-06-145-3/+95
* | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-151-2/+2
|\ \ \
| * | | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-131-2/+2
* | | | Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'Sean McGivern2017-06-151-1/+2
|\ \ \ \
| * | | | Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
| * | | | Backport merge_params.html.haml conflict commentLuke "Jared" Bennett2017-06-141-1/+1
| | |_|/ | |/| |
* | | | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-3/+25
|\ \ \ \
| * | | | Fix note highlight being lost after real time updateEric Eastwood2017-06-141-3/+25
| |/ / /
* | | | Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'Phil Hughes2017-06-151-10/+14
|\ \ \ \
| * | | | Fix milestone page assignees when dropped in ongoing listEric Eastwood2017-06-141-10/+14
| |/ / /
* | | | Merge branch 'dm-target-branch-slash-command-desc' into 'master'Robert Speicher2017-06-141-1/+1
|\ \ \ \
| * | | | Update /target_branch slash command description to be more consistentdm-target-branch-slash-command-descDouwe Maan2017-06-141-1/+1
* | | | | Remove extra line so that it is consistent with EEClement Ho2017-06-141-1/+0
* | | | | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix autocomplete not working on note edit formEric Eastwood2017-06-141-1/+1
| |/ / /
* | | | Merge branch 'pipelines-row-vue-file-fix' into 'master'Annabel Dunstone Gray2017-06-141-1/+1
|\ \ \ \
| * | | | Fixed pipelines Vue template not ending correctlypipelines-row-vue-file-fixPhil Hughes2017-06-141-1/+1
| |/ / /
* | | | Merge branch 'winh-select2-remove-token' into 'master'Annabel Dunstone Gray2017-06-141-2/+4
|\ \ \ \
| * | | | Move remove token of Select2 to the rightwinh2017-06-141-2/+4
| | |_|/ | |/| |
* | | | Merge branch '31263-fix-fenced-code-misalignment-with-activity' into 'master'Annabel Dunstone Gray2017-06-141-1/+0
|\ \ \ \
| * | | | Fix fenced code block misalignment in events/activity31263-fix-fenced-code-misalignment-with-activityEric Eastwood2017-06-131-1/+0
* | | | | Merge branch '32470-pag-links' into 'master'Annabel Dunstone Gray2017-06-141-3/+3
|\ \ \ \ \
| * | | | | more visual contrast for active page in pagination widget32470-pag-linksSimon Knox2017-06-131-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-146-12/+44
|\ \ \ \ \
| * | | | | Help landing page customizationsRobin Bobbitt2017-06-146-12/+44
* | | | | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-1428-35/+305
|\ \ \ \ \ \
| * | | | | | Implement diff viewersDouwe Maan2017-06-1428-35/+305
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-19/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-19/+18
* | | | | | Merge branch '33149-rename-more-builds' into 'master'Kamil Trzciński2017-06-141-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-1430-204/+184
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-13365-2170/+4562
| |\ \ \ \ \ \ \
| * | | | | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-061-1/+1
* | | | | | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-141-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix etag route missesZ.J. van de Weg2017-06-121-1/+2
* | | | | | | | | | Move vue components to vue files and match docsFilipa Lacerda2017-06-1417-828/+839
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Adds back whitespace for job's traceFilipa Lacerda2017-06-141-0/+1
* | | | | | | | | Merge branch 'backport-empty-panel-heading-styles-from-related-issues' into '...Filipa Lacerda2017-06-141-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport empty panel heading from EE related issuesbackport-empty-panel-heading-styles-from-related-issuesEric Eastwood2017-06-131-0/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'backport-related-issues-board-issue-count-badge-styles' into 'm...Filipa Lacerda2017-06-144-28/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-134-28/+37
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1413-19/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-133-6/+5
| * | | | | | | Rename BuildEntity to JobEntityKamil Trzcinski2017-06-135-7/+7
| * | | | | | | Fix support for external_url for commit statusesKamil Trzcinski2017-06-131-1/+1
| * | | | | | | Allow to access pipelines even if they are disabled, but only present jobs an...Kamil Trzcinski2017-06-137-7/+8