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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix diff comment button not showing after deleting a commentdont-remove-add-diff-btn-on-post	Phil Hughes	2017-09-01	5	-6/+26
\| \| \| \|	Closes #37142
*	Merge branch 'delete-branches-with-prefixes' into 'master'	Douwe Maan	2017-09-01	2	-9/+10
\|\ \| \| \| \| \| \| \| \|	Simplify Git interactions in AfterImportService See merge request !13962
\| *	Simplify Git interactions in AfterImportService	Jacob Vosmaer (GitLab)	2017-09-01	2	-9/+10
\|/
*	Merge branch '37202-revert-changes-to-signing-enabled' into 'master'	Douwe Maan	2017-09-01	12	-33/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
\| *	Rollsback changes made to signing_enabled.	Tiago Botelho	2017-09-01	12	-33/+31
\| \|
* \|	Merge branch 'add_message_to_the_404_page' into 'master'	Douwe Maan	2017-09-01	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Changed message and title on the 404 page See merge request !13982
\| * \|	Changed title on 404 page	Branka Martinovic	2017-09-01	1	-1/+1
\| \| \|
\| * \|	Changed message and title on the 404 page	Branka Martinovic	2017-09-01	2	-1/+7
\| \| \|
* \| \|	Merge branch 'group-merge-requests-test-fix' into 'master'	Sean McGivern	2017-09-01	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed group merge requests failure See merge request !13985
\| * \| \|	Fixed group merge requests failure	Phil Hughes	2017-09-01	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'winh-member-permission-dropdown' into 'master'	Phil Hughes	2017-09-01	2	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make member permission dropdowns consistent See merge request !13600
\| * \| \| \|	Make member permission dropdowns consistentwinh-member-permission-dropdown	winh	2017-08-30	2	-0/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'move-action' into 'master'	Sean McGivern	2017-09-01	8	-1/+175
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request to address /move functionality. See merge request !13436
\| * \| \| \| \|	/move project functionality. Squash commit.	Manolis Mavrofidis	2017-08-31	8	-1/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to add all issues to be updated. Added functionality, proper tests, documentation and changelog.
* \| \| \| \| \|	Merge branch 'gitaly-0.36.0' into 'master'	Sean McGivern	2017-09-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.36.0 See merge request !13961
\| * \| \| \| \| \|	Use gitaly 0.36.0gitaly-0.36.0	Jacob Vosmaer	2017-09-01	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature/sm/2783-rename-codeclimate-to-codequality-ce' into ↵	Kamil Trzciński	2017-09-01	2	-4/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport to CE: Support `codequality` job name for Code Quality feature See merge request !13833
\| * \| \| \| \| \| \|	fix docfeature/sm/2783-rename-codeclimate-to-codequality-ce	Shinya Maeda	2017-08-31	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Squashed commit of the following:	Shinya Maeda	2017-08-31	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 79858a631af97c2857700fa44c0e7ba09d621e12 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Aug 25 23:33:04 2017 +0900 Fix doc commit d0c864c7f1522bd254458a7d6e1002352f34a143 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 22 22:27:32 2017 +0900 Add tests commit 1628eb8598f8ad0e6b573f3fb4fdcf5c3776885b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 22 10:14:44 2017 +0000 Update .gitlab-ci.yml commit 440a3cdd0bb5d7b83f861f6d3762510b40df984a Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Aug 18 14:46:56 2017 +0000 Update build.rb commit e925951e35c889bfc0520ce056e7df7befdeb93b Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Aug 17 18:13:17 2017 +0900 Add changelog commit 7de5b4f50fc1ff6987c9a861c057c816d4fb285d Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Aug 17 18:11:53 2017 +0900 ini
* \| \| \| \| \| \| \|	Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'	Sean McGivern	2017-09-01	7	-4/+95
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'from commit' information to cherry-picked commits See merge request !13475
\| * \| \| \| \| \| \|	Improve description of a Commit#cherry_pick_message UT	Saverio Miroddi	2017-08-22	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog entry	Saverio Miroddi	2017-08-22	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix rubocop errors in spec/models/commit_spec.rb	Saverio Miroddi	2017-08-21	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add UT for cherry-pick of an existing merge that is not found	Saverio Miroddi	2017-08-21	1	-19/+30
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change a variable name in Commit#cherry_pick_description	Saverio Miroddi	2017-08-21	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reverse order of commits in MR cherry-pick message	Saverio Miroddi	2017-08-21	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improved the UT for better documenting this change.
\| * \| \| \| \| \| \|	Remove redundant statement part in a test suite	Saverio Miroddi	2017-08-18	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Correct the cherry-pick message for merge commits	Saverio Miroddi	2017-08-17	5	-23/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The list of commits must be generated from the merge request, not from a diff of the branches.
\| * \| \| \| \| \| \|	Extended UTs for the new cherry-pick message format	Saverio Miroddi	2017-08-16	2	-1/+28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix build failures related to cherry-pick message changes	Saverio Miroddi	2017-08-16	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add support for start project to commit cherry-pick description	Saverio Miroddi	2017-08-15	2	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Made commit cherry-pick message more standard	Saverio Miroddi	2017-08-15	1	-11/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the `cherry pick -x` format for the first line, and the interactive rebase format for the commits in the merge, in case of merge commit
\| * \| \| \| \| \| \|	Extracted cherry-pick description in ::Commit	Saverio Miroddi	2017-08-15	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also fixes the inconsistency between non/merge commits in the number of newlines introduced.
\| * \| \| \| \| \| \|	Merge branch 'master' into sm-cherry-pick-list-commits-in-message	Saverio Miroddi	2017-08-15	461	-2658/+6715
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add 'from commit' information to cherry-picked commits	Saverio Miroddi	2017-08-10	2	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store the original commit in the commit message. In case of merge commit, the commits added to the start branch are also listed.
* \| \| \| \| \| \| \| \|	Merge branch '35686-unescape-wiki-title' into 'master'	Sean McGivern	2017-09-01	3	-1/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unescape HTML characters in Wiki title Closes #35686 See merge request !13942
\| * \| \| \| \| \| \| \| \|	Unescape HTML characters in Wiki title	Jacopo	2017-08-30	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The special characters of a wiki title are now escaped correctly.
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_36820' into 'master'	Sean McGivern	2017-09-01	3	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove closing external issues by reference error Closes #36820 See merge request !13910
\| * \| \| \| \| \| \| \| \| \|	Remove closing external issues by reference errorissue_36820	Felipe Artur	2017-08-31	3	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '36061-mr-ref-instrument' into 'master'	Sean McGivern	2017-09-01	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequest#fetch_ref See merge request !13980
\| * \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequest#fetch_ref36061-mr-ref-instrument	Jarka Kadlecova	2017-09-01	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-api-use-project-requirements' into 'master'	Sean McGivern	2017-09-01	32	-35/+35
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Use defined project requirements See merge request !13960
\| * \| \| \| \| \| \| \| \| \| \| \|	API: Use defined project requirementsrs-api-use-project-requirements	Robert Schilling	2017-08-31	32	-35/+35
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rouge-2.2.1' into 'master'	Sean McGivern	2017-09-01	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rouge to 2.2.1 See merge request !13887
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Bump rouge to 2.2.1	pbr	2017-08-29	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-post-upload-pack-mandatory' into 'master'	Douwe Maan	2017-09-01	3	-18/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Gitaly PostUploadPack mandatory Closes gitaly#184 and gitaly#219 See merge request !13953
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Make Gitaly PostUploadPack mandatory	Jacob Vosmaer (GitLab)	2017-09-01	3	-18/+9
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'enable-new-navigaton-by-default' into 'master'	Tim Zallmann	2017-09-01	43	-172/+133
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the new navigation by default See merge request !13387
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-default	Phil Hughes	2017-08-30	215	-2768/+5720
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	more navigation spec fixes	Phil Hughes	2017-08-30	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|