summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch 'bpj-small-pipeline-ui-changes' into 'master'Annabel Dunstone Gray2017-06-132-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changesBryce Johnson2017-06-132-2/+2
* | | | | | | | Merge branch '33628-pipeline-sidebar' into 'master'Phil Hughes2017-06-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds "Pipeline" to job's sidebar33628-pipeline-sidebarFilipa Lacerda2017-06-131-0/+1
* | | | | | | | | Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-131-14/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove js classes from vue component that are not needed in vue component33642-timeago-updateFilipa Lacerda2017-06-131-14/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'wiki-limited-width' into 'master'Annabel Dunstone Gray2017-06-1310-152/+149
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Limit wiki container widthwiki-limited-widthPhil Hughes2017-06-1310-152/+149
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-131-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Change border color of job's scroll controllers to $border-colorFilipa Lacerda2017-06-131-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'tidy-up-issues-controller-filters' into 'master'Douwe Maan2017-06-131-9/+6
|\ \ \ \ \ \ \
| * | | | | | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
* | | | | | | | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-131-5/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-5/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'zj-commit-status-sortable-name' into 'master'Grzegorz Bizon2017-06-131-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Center dropdown for pipeline's mini graphFilipa Lacerda2017-06-131-1/+10
* | | | | | Merge branch 'fix/33584-atom-layout' into 'master'Rémy Coutable2017-06-1316-79/+59
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Refactor atom builder by using xml.atom layoutTieu-Philippe KHIM2017-06-1216-79/+59
* | | | | | Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploaderKamil Trzcinski2017-06-131-0/+4
| |/ / / / |/| | | |
* | | | | Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-123-12/+23
|\ \ \ \ \
| * | | | | Set artifact working directory to be in the destination store to prevent unne...sh-fix-refactor-uploader-work-dirStan Hu2017-06-063-12/+23
* | | | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1210-1/+76
|\ \ \ \ \ \