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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Spell out commands for omnibus-gitlab packages.issue_guidelines_with_omnibus_commands	Marin Jankovski	2015-11-24	1	-2/+2
\|
*	Merge branch 'service-tests' into 'master'	Dmitriy Zaporozhets	2015-11-24	2	-0/+68
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for (Create\|Update)ReleaseService As promised See merge request !1875
\| *	Add tests for (Create\|Update)ReleaseServiceservice-tests	Robert Schilling	2015-11-23	2	-0/+68
\| \|
* \|	Merge branch 'ci-artifacts-path' into 'master'	Robert Speicher	2015-11-23	7	-6/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869
\| * \|	Expose artifacts pathci-artifacts-path	Kamil Trzcinski	2015-11-23	7	-6/+22
\| \| \|
* \| \|	Merge branch 'ci-fix-500' into 'master'	Robert Speicher	2015-11-23	4	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 when using CI - Fix for Ci::Build state machine, allowing to process builds without the project - Forcefully update builds that didn't want to update with state machine - Fix saving GitLabCiService as Admin Template Fixes #3556 See merge request !1873
\| * \| \|	Update CHANGELOG	Robert Speicher	2015-11-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Fix 500 when using CIci-fix-500	Kamil Trzcinski	2015-11-23	4	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix for Ci::Build state machine, allowing to process builds without the project - Forcefully update builds that didn't want to update with state machine - Fix saving GitLabCiService as Admin Template
* \| \| \|	Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'	Robert Speicher	2015-11-23	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CSS styling for clipboard icon in new MR page Closes #3602 See merge request !1870
\| * \| \| \|	Fix CSS styling for clipboard icon in new MR page	Stan Hu	2015-11-22	1	-0/+4
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #3602
* \| \| \|	Merge branch 'bundler-audit' into 'master'	Dmitriy Zaporozhets	2015-11-23	3	-0/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bundler-audit to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @rspeicher @vsizov See merge request !1874
\| * \| \| \|	Allow bundler:audit to fail	Dmitriy Zaporozhets	2015-11-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix gitlab-ci.yml syntax	Dmitriy Zaporozhets	2015-11-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Add bundler-audit to CI	Dmitriy Zaporozhets	2015-11-23	3	-0/+13
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'required_version_and_docs_update' into 'master'	Dmitriy Zaporozhets	2015-11-23	6	-43/+77
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update required version of lfs client and separate the docs for users and admins. See merge request !1855
\| * \| \|	Add few fixes to documentation based on comments from review	Dmitriy Zaporozhets	2015-11-23	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_update	Marin Jankovski	2015-11-20	6	-43/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admins.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-11-23	8	-32/+196
\|\ \ \ \
\| * \ \ \	Merge branch 'issue_2296' into 'master'	Douwe Maan	2015-11-23	8	-32/+196
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate system note after Task item has been updated on Issue or Merge Request. Reference: #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported. See merge request !1848
\| \| * \| \|	Little fix for Rubocop's complaints. #2296issue_2296	Rubén Dávila	2015-11-20	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Fix bug that happened when replacing the Task list. #2296	Rubén Dávila	2015-11-20	2	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
\| \| * \| \|	Monkey patching TaskList::Item is no longer required. #2296	Rubén Dávila	2015-11-20	3	-13/+4
\| \| \| \| \|
\| \| * \| \|	Refactor creation of system notes for Issue/MR labels. #2296	Rubén Dávila	2015-11-20	1	-10/+7
\| \| \| \| \|
\| \| * \| \|	Generate system note after Task item has been updated on Issue or Merge ↵	Ruben Davila	2015-11-19	9	-24/+181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Request. #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported.
* \| \| \| \|	Merge pull request #9843 from ferdinandrosario/upgrade	Dmitriy Zaporozhets	2015-11-23	2	-28/+28
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Updated rails patch
\| * \| \| \|	Updated rails patch	Ferdinand Rosario	2015-11-19	2	-28/+28
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_2993' into 'master'	Dmitriy Zaporozhets	2015-11-23	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update copy used in alert message when deleting branches or tags. Reference: #2993 Before: ![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png) ![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png) After: ![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png) ![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png) See merge request !1846
\| * \| \| \| \|	Update copy used in alert message when deleting branches or tags. #2993issue_2993	Rubén Dávila	2015-11-19	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue-2831' into 'master'	Douwe Maan	2015-11-23	2	-5/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Assignee selector when 'Unassigned' #2831 Fixes #2831 ![Screen_Shot_2015-11-21_at_12.04.42_AM](/uploads/e3cb98ff805366805f4a989d927e3f10/Screen_Shot_2015-11-21_at_12.04.42_AM.png) See merge request !1860
\| * \| \| \| \| \|	Fix Assignee selector when 'Unassigned' #2831	Jose Corcuera	2015-11-20	2	-5/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update doc/release/patch.md with more current patch procedures	Robert Speicher	2015-11-22	1	-8/+32
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'award_fix' into 'master'	Robert Speicher	2015-11-22	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji bug: Invalid url to image Closes #3591 See merge request !1868
\| * \| \| \| \| \|	Emoji bug: Invalid url to imageaward_fix	Valery Sizov	2015-11-22	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-award-emoji-api' into 'master'	Robert Speicher	2015-11-22	5	-10/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
\| * \| \| \| \| \| \|	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 'consistent-tags-api' into 'master'	Stan Hu	2015-11-21	7	-24/+196
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make tag API for release feature consistent Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`. On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404. @stanhu Can you review? @rspeicher This MR should go into 8.2 See merge request !1864
\| * \| \| \| \| \| \|	Allow editing a release in API via PUT method	Robert Schilling	2015-11-21	5	-1/+112
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only allow to create a release if it does not exist yet	Robert Schilling	2015-11-21	4	-8/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use POST to create a new release instead of PUT	Robert Schilling	2015-11-21	3	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	API: Return 404 if the tag for a release does not exist	Robert Schilling	2015-11-21	5	-9/+47
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make tag API consistent for release feature	Robert Schilling	2015-11-21	4	-13/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \|