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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-api	Robert Schilling	2015-11-21	5	-10/+58
\| \| \| \|	compatibility
*	Merge branch 'ci-doc-yaml' into 'master'	Kamil Trzciński	2015-11-21	1	-49/+41
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI yaml syntax documentation [ci skip] See merge request !1866
\| *	Fix CI yaml syntax documentation [ci skip]	Kamil Trzcinski	2015-11-21	1	-49/+41
\|/
*	Merge branch 'award_fix' into 'master'	Robert Speicher	2015-11-21	1	-2/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Award Emoji: fix for merge requests Closes #3597 See merge request !1865
\| *	Award: merge request fix	Valery Sizov	2015-11-21	1	-2/+5
\| \|
* \|	Add award_emoji.png doc image	Robert Speicher	2015-11-21	1	-0/+0
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'issue_3598' into 'master'	Robert Speicher	2015-11-21	1	-3/+0
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Remove accidentally added line. Reference: #3598 See merge request !1858
\| *	Remove accidentally added line. #3598issue_3598	Rubén Dávila	2015-11-20	1	-3/+0
\| \| \| \| \| \| \| \|	It should exist in EE only.
* \|	Merge branch 'award-emoji-doc' into 'master'	Robert Speicher	2015-11-21	2	-5/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863
\| * \|	Use award emoticons in GitLab workflow [ci skip]	Robert Schilling	2015-11-21	2	-5/+4
\| \| \|
* \| \|	Merge branch 'api-tags-doc' into 'master'	Robert Speicher	2015-11-21	1	-0/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tags page to readme The tags page was separated for the release feature but not to the index readme. [ci skip] See merge request !1861
\| * \|	Add tags page to readme [ci skip]api-tags-doc	Robert Schilling	2015-11-21	1	-0/+1
\|/ /
* \|	Merge branch 'fix-merge-requests-without-source-projects' into 'master'	Dmitriy Zaporozhets	2015-11-21	2	-1/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle removed source projects in MR CI commits Fixes #3599 @dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this. See merge request !1859
\| * \|	Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projects	Yorick Peterse	2015-11-20	2	-1/+26
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information.
* \|	Merge branch 'gitlab-ee-d39de0ea-backport' into 'master'	Dmitriy Zaporozhets	2015-11-21	2	-10/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port GitLab EE ProjectsFinder changes These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE. See merge request !1854
\| * \|	Port GitLab EE ProjectsFinder changesgitlab-ee-d39de0ea-backport	Yorick Peterse	2015-11-20	2	-10/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE.
* \| \|	Merge branch 'ee-flog' into 'master'	Dmitriy Zaporozhets	2015-11-21	2	-31/+27
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce method complexity in AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833
\| * \|	Reduce method complexity in AutocompleteControlleree-flog	Douwe Maan	2015-11-20	2	-31/+27
\| \| \|
* \| \|	Merge branch 'fix-scss-syntax-error' into 'master'	Stan Hu	2015-11-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix syntax error in common.scss Fix a syntax error. See merge request !1857
\| * \| \|	fix syntax error in common.scss	Greg Smethells	2015-11-20	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'fix-drone-service-hook' into 'master'	Stan Hu	2015-11-20	1	-0/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Drone web hook URL not being updated Fixes regression of !1774: fixes Drone Web hook for both service templates and project services. See merge request !1856
\| * \|	Fix Drone web hook URL not being updated	Stan Hu	2015-11-20	1	-0/+2
\| \| \|
* \| \|	Merge branch 'workhorse-version' into 'master'	Jacob Vosmaer	2015-11-20	4	-5/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab Workhorse version to 0.4.2 See merge request !1830
\| * \| \|	Update gitlab-workhorse docs to 0.4.2workhorse-version	Robert Schilling	2015-11-19	2	-3/+3
\| \| \| \|
\| * \| \|	Bump GitLab Workhorse version to 0.4.2	Kamil Trzcinski	2015-11-19	2	-2/+1
\| \| \| \|
* \| \| \|	Merge branch 'lfs-batch-download' into 'master'	Marin Jankovski	2015-11-20	3	-283/+419
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for batch download operation - Drops Accept for all download requests, - Allows to do batch download for public projects and non-authorized users - Returns 501 for legacy API with message to upgrade the client /cc @marin @jacobvosmaer @yorickpeterse See merge request !1842
\| * \| \| \|	Error 501 when client is using deprecated API.	Marin Jankovski	2015-11-20	3	-195/+49
\| \| \| \| \|
\| * \| \| \|	Fix upload tests, reformat code and make rubocop happy	Kamil Trzcinski	2015-11-20	2	-122/+110
\| \| \| \| \|
\| * \| \| \|	Part of tests done [ci skip]	Kamil Trzcinski	2015-11-20	2	-104/+338
\| \| \| \| \|
\| * \| \| \|	Add support for batch download operationlfs-batch-download	Kamil Trzcinski	2015-11-19	3	-36/+96
\| \| \| \| \|
* \| \| \| \|	Merge branch 'notes_fix_stable' into 'master'	Dmitriy Zaporozhets	2015-11-20	4	-4/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for Emoji See merge request !1849
\| * \| \| \| \|	Fix for Emojinotes_fix_stable notes_fix	Valery Sizov	2015-11-20	4	-4/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'lfs_default_and_backup' into 'master'	Dmitriy Zaporozhets	2015-11-20	7	-9/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lfs default and backup Part of gitlab-org/gitlab-ce#2955 See merge request !1823
\| * \| \| \| \| \|	Add lfs to backup specs.lfs_default_and_backup	Marin Jankovski	2015-11-19	1	-5/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backup LFS objects same as any upload.	Marin Jankovski	2015-11-19	4	-2/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Lfs on by default.	Marin Jankovski	2015-11-19	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-docs' into 'master'	Achilleas Pipinellis	2015-11-20	4	-9/+7
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More GitLab spellings. No dedicated CI in omnibus See merge request !1838
\| * \| \| \| \| \|	More GitLab spellings. No dedicated CI in omnibus [ci skip]update-docs	Robert Schilling	2015-11-19	4	-9/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-lfs-docs' into 'master'	Marin Jankovski	2015-11-20	1	-3/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update LFS docs for cloning Cloning the repo already downloads the LFS tracked files. See merge request !1839
\| * \| \| \| \| \| \|	Update LFS docs for cloning [ci skip]update-lfs-docs	Robert Schilling	2015-11-19	1	-3/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-mr-reference-copy' into 'master'	Robert Speicher	2015-11-20	1	-2/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clipboard button to merge request cross-project reference See merge request !1847
\| * \| \| \| \| \|	Add clipboard button to merge request cross-project reference	Robert Speicher	2015-11-19	1	-2/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'rs-safari-clipboard-fallback' into 'master'	Robert Speicher	2015-11-19	1	-5/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a fallback for Safari copy-to-clipboard Also, hide the tooltip in a less stupid way. Closes #3547 See merge request !1844
\| * \| \| \| \| \|	Add a fallback for Safari copy-to-clipboardrs-safari-clipboard-fallback	Robert Speicher	2015-11-19	1	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, hide the tooltip in a less stupid way. Closes #3547
* \| \| \| \| \| \|	Merge branch 'ci-yaml-validation' into 'master'	Kamil Trzciński	2015-11-19	6	-22/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827
\| * \| \| \| \| \| \|	Don't rescue Exception, but StandardErrorci-yaml-validation	Kamil Trzcinski	2015-11-19	2	-8/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix tests	Kamil Trzcinski	2015-11-19	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Since GitLab CI is enabled by default, remove enabling it by pushing ↵	Kamil Trzcinski	2015-11-19	2	-12/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.gitlab-ci.yml
\| * \| \| \| \| \| \|	Fix tests	Kamil Trzcinski	2015-11-19	2	-20/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Commits without .gitlab-ci.yml are marked as skipped	Kamil Trzcinski	2015-11-19	3	-3/+28
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Save detailed error when YAML syntax