summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-143-2/+6
* Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-1440-39/+1153
|\
| * Implement diff viewersDouwe Maan2017-06-1440-39/+1153
* | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-145-57/+107
|\ \ | |/ |/|
| * Backport EE changes to the Kubernetes serviceNick Thomas2017-06-145-57/+107
* | Merge branch '33149-rename-more-builds' into 'master'Kamil Trzciński2017-06-144-200/+202
|\ \
| * | Fix other renamingLin Jen-Shin2017-06-141-1/+1
| * | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-14117-393/+1485
| |\ \
| * | | Fix other renamingLin Jen-Shin2017-06-141-11/+11
| * | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-13843-4496/+15172
| |\ \ \
| * | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-064-195/+197
* | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-147-56/+36
|\ \ \ \ \
| * | | | | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-125-55/+32
| * | | | | Fix etag route missesZ.J. van de Weg2017-06-122-3/+4
| * | | | | Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
* | | | | | Merge branch 'vue-pipelines-code' into 'master'Phil Hughes2017-06-1425-836/+847
|\ \ \ \ \ \
| * | | | | | Move vue components to vue files and match docsFilipa Lacerda2017-06-1425-836/+847
|/ / / / / /
* | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-06-141-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix Markdown in JIRA integration docsAdam Niedzielski2017-06-141-1/+1
|/ / / / /
* | | | | Merge branch '33639-whitespace' into 'master'32795-internationalise-project-activity-pagePhil Hughes2017-06-141-0/+1
|\ \ \ \ \
| * | | | | 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-145-36/+45
|\ \ \ \ \ \
| * | | | | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-135-36/+45
| |/ / / / /
* | | | | | Merge branch 'docs/codeclimate-fix-link' into 'master'Sean Packham2017-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Fix wrong link to codeclimate diff docsdocs/codeclimate-fix-linkAchilleas Pipinellis2017-06-141-1/+1
* | | | | | | Merge branch 'docs/personal-access-tokens' into 'master'Sean Packham2017-06-1411-90/+157
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add docs for personal access tokensdocs/personal-access-tokensAchilleas Pipinellis2017-06-1411-90/+157
| |/ / / / /
* | | | | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-1418-135/+543
|\ \ \ \ \ \
| * | | | | | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| * | | | | | Improve specs for GitlabCiYamlProcessorTomasz Maczukin2017-06-121-50/+105
| * | | | | | Refactor old formad handling in lib/ci/api/entities.rbTomasz Maczukin2017-06-121-6/+2
| * | | | | | Rename API::Entities::JobRequest::ServiceImage to API::Entities::JobRequest::...Tomasz Maczukin2017-06-121-2/+2
| * | | | | | Add CHANGELOG entryTomasz Maczukin2017-06-121-0/+4
| * | | | | | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-122-1/+31
| * | | | | | Send new configuration options with job's payloadTomasz Maczukin2017-06-125-16/+75
| * | | | | | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-1211-75/+350
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-1424-43/+175
|\ \ \ \ \ \
| * | | | | | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-1313-18/+124
| * | | | | | Rename BuildEntity to JobEntityKamil Trzcinski2017-06-137-20/+41
| * | | | | | 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-138-7/+12
* | | | | | | Merge branch 'bpj-small-pipeline-ui-changes' into 'master'Annabel Dunstone Gray2017-06-133-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changesBryce Johnson2017-06-133-3/+3
* | | | | | | | 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-132-26/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove js classes from vue component that are not needed in vue component33642-timeago-updateFilipa Lacerda2017-06-132-26/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'revert-1b54982f' into 'master'Robert Speicher2017-06-1311-41/+168
|\ \ \ \ \ \ \ \ \