delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignment	Eric Eastwood	2017-06-14	1	-2/+3
\| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31782 The unused toggle was removed previously, https://gitlab.com/gitlab-org/gitlab-ce/commit/cc37d1dfa11691f2d8357151d4b722b3d114881e#cf11229dd714f7f4b46f102ce6846e25528b6689_7_6
*	Merge branch '33149-rename-more-builds' into 'master'	Kamil Trzciński	2017-06-14	4	-200/+202
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix raw_path with the new job path, rename builds to jobs in test Closes #33149 See merge request !11941
\| *	Fix other renaming	Lin Jen-Shin	2017-06-14	1	-1/+1
\| \|
\| *	Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds	Lin Jen-Shin	2017-06-14	117	-393/+1485
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (34 commits) Revert "Merge branch 'karma-headless-chrome' into 'master'" Make small pipeline schedules UI enhancements. Remove js classes from vue component that are not needed in vue component Update tests and application Adds "Pipeline" to job's sidebar Change border color of job's scroll controllers to $border-color Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Added Tectonic to the page. Always check read_issue permissions when loading issue Handle legacy jobs without name Do not expose internal artifacts hash in build entity Use wait_for_requests instead of sleep 0.3 Limit wiki container width Fix migrations testing support RSpec hooks order Rename BuildEntity to JobEntity Fix support for external_url for commit statuses Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them add CHANGELOG.md entry for !12036 remove phantomjs-specific test hacks update karma job to use chrome build image created by gitlab-build-images!41 ...
\| * \|	Fix other renaming	Lin Jen-Shin	2017-06-14	1	-11/+11
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-builds	Lin Jen-Shin	2017-06-13	843	-4496/+15172
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (460 commits) Center dropdown for pipeline's mini graph Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions Fix filename method of GitlabUploader to return always real filename Ignore CVE-2017-5029 in Nokogiri Refactor atom builder by using xml.atom layout Let PhantomJS load local images Add a changelog entry Only add a description change note when no tasks are updated Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) Use gitaly 0.11.2 Add the ability to perform background migrations Always render warnings icon in orange Fix a few translation for zh_TW Improve Job detail view to make it refreshed in real-time instead of reloading Attempts to run RSpec tests twice (1 retry) ignore name validation on importing Only show hover state on links and buttons Use vue files for navigation tabs and buttons doc: add example of scheduler when Add test for u2f helper and changelog entry ...
\| * \| \|	Fix raw_path with the new job path, rename to job	Lin Jen-Shin	2017-06-06	4	-195/+197
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the tests
* \| \| \|	Merge branch 'zj-raise-etag-route-regex-miss' into 'master'	Kamil Trzciński	2017-06-14	7	-56/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise etag route regex miss Closes #33106 See merge request !12084
\| * \| \| \|	Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-miss	Z.J. van de Weg	2017-06-12	5	-55/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
\| * \| \| \|	Fix etag route misses	Z.J. van de Weg	2017-06-12	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#33106
\| * \| \| \|	Raise exception on invalid pipeline cache	Kamil Trzcinski	2017-06-12	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'vue-pipelines-code' into 'master'	Phil Hughes	2017-06-14	25	-836/+847
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move vue components to vue files and match docs See merge request !12146
\| * \| \| \| \|	Move vue components to vue files and match docs	Filipa Lacerda	2017-06-14	25	-836/+847
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-24' into 'master'	Sean McGivern	2017-06-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown in JIRA integration docs See merge request !12160
\| * \| \| \| \|	Fix Markdown in JIRA integration docs	Adam Niedzielski	2017-06-14	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch '33639-whitespace' into 'master'32795-internationalise-project-activity-page	Phil Hughes	2017-06-14	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds back whitespace for job's trace Closes #33639 See merge request !12142
\| * \| \| \| \|	Adds back whitespace for job's trace	Filipa Lacerda	2017-06-14	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'backport-empty-panel-heading-styles-from-related-issues' into ↵	Filipa Lacerda	2017-06-14	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport empty panel heading from EE related issues See merge request !12153
\| * \| \| \| \|	Backport empty panel heading from EE related issuesbackport-empty-panel-heading-styles-from-related-issues	Eric Eastwood	2017-06-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/commit/4b5a1c9a6570d70cd3e16b3c1d3c2ec0471f46eb#777d5694836def44d2a73f1c7590aea20aed6c22_35_35 From MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/
* \| \| \| \| \|	Merge branch 'backport-related-issues-board-issue-count-badge-styles' into ↵	Filipa Lacerda	2017-06-14	5	-36/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport issue count badge style refactor for re-use from EE related issues See merge request !12152
\| * \| \| \| \| \|	Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-styles	Eric Eastwood	2017-06-13	5	-36/+45
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added by https://gitlab.com/gitlab-org/gitlab-ee/commit/88aea2cbc8633ba970335d935d725bd17654b424 Part of this MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/
* \| \| \| \| \|	Merge branch 'docs/codeclimate-fix-link' into 'master'	Sean Packham	2017-06-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link to codeclimate diff docs See merge request !12158
\| * \| \| \| \| \|	Fix wrong link to codeclimate diff docsdocs/codeclimate-fix-link	Achilleas Pipinellis	2017-06-14	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/personal-access-tokens' into 'master'	Sean Packham	2017-06-14	11	-90/+157
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for personal access tokens Closes #31740 and #33261 See merge request !12128
\| * \| \| \| \| \|	Add docs for personal access tokensdocs/personal-access-tokens	Achilleas Pipinellis	2017-06-14	11	-90/+157
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'feature/add-support-for-services-configuration' into 'master'	Grzegorz Bizon	2017-06-14	18	-135/+543
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for services configuration in .gitlab-ci.yml See merge request !8578
\| * \| \| \| \| \|	Remove Gitlab::Ci::Config::Entry::DockerImage	Tomasz Maczukin	2017-06-12	3	-34/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve specs for GitlabCiYamlProcessor	Tomasz Maczukin	2017-06-12	1	-50/+105
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor old formad handling in lib/ci/api/entities.rb	Tomasz Maczukin	2017-06-12	1	-6/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename API::Entities::JobRequest::ServiceImage to ↵	Tomasz Maczukin	2017-06-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API::Entities::JobRequest::Service
\| * \| \| \| \| \|	Add CHANGELOG entry	Tomasz Maczukin	2017-06-12	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Ensure that old API v1 generates still the same output	Tomasz Maczukin	2017-06-12	2	-1/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Send new configuration options with job's payload	Tomasz Maczukin	2017-06-12	5	-16/+75
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add support for docker image configuration in .gitlab-ci.yml	Tomasz Maczukin	2017-06-12	11	-75/+350
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-external-ci-services' into 'master'	Grzegorz Bizon	2017-06-14	24	-43/+175
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
\| * \| \| \| \| \|	Update tests and applicationfix-external-ci-services	Kamil Trzcinski	2017-06-13	13	-18/+124
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename BuildEntity to JobEntity	Kamil Trzcinski	2017-06-13	7	-20/+41
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix support for external_url for commit statuses	Kamil Trzcinski	2017-06-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow to access pipelines even if they are disabled, but only present jobs ↵	Kamil Trzcinski	2017-06-13	8	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and commit statuses without giving ability to access them
* \| \| \| \| \| \|	Merge branch 'bpj-small-pipeline-ui-changes' into 'master'	Annabel Dunstone Gray	2017-06-13	3	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make small pipeline schedules UI enhancements. Closes #32565 See merge request !12136
\| * \| \| \| \| \| \|	Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changes	Bryce Johnson	2017-06-13	3	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '33628-pipeline-sidebar' into 'master'	Phil Hughes	2017-06-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds "Pipeline" to job's sidebar Closes #33628 See merge request !12131
\| * \| \| \| \| \| \| \|	Adds "Pipeline" to job's sidebar33628-pipeline-sidebar	Filipa Lacerda	2017-06-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '33642-timeago-update' into 'master'	Phil Hughes	2017-06-13	2	-26/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove js classes from vue component that are not needed in vue component Closes #33642 See merge request !12133
\| * \| \| \| \| \| \| \| \|	Remove js classes from vue component that are not needed in vue component33642-timeago-update	Filipa Lacerda	2017-06-13	2	-26/+3
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'revert-1b54982f' into 'master'	Robert Speicher	2017-06-13	11	-41/+168
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'karma-headless-chrome' into 'master'" See merge request !12137
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'karma-headless-chrome' into 'master'"	Mike Greiling	2017-06-13	11	-41/+168
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12036
* \| \| \| \| \| \| \| \|	Merge branch 'wiki-limited-width' into 'master'	Annabel Dunstone Gray	2017-06-13	10	-152/+149
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit wiki container width Closes #23734 See merge request !12089
\| * \| \| \| \| \| \| \|	Limit wiki container widthwiki-limited-width	Phil Hughes	2017-06-13	10	-152/+149
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23734
* \| \| \| \| \| \| \|	Merge branch '33629-scroll-color' into 'master'	Phil Hughes	2017-06-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change border color of job's scroll controllers to $border-color Closes #33629 See merge request !12129