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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove the `gfm_with_options` helperrs-remove-gfm_with_options	Robert Speicher	2015-08-12	3	-14/+4
\| \| \| \|	It was redundant because `gfm` also took options.
*	Merge branch 'note-query-information' into 'master'	Stan Hu	2015-08-12	3	-2/+15
\|\ \| \| \| \| \| \| \| \| \| \|	Note query information See merge request !1149
\| *	api: add 'system', 'upvote', and 'downvote' fields to note queries	Ben Boeckel	2015-08-12	3	-2/+15
\| \| \| \| \| \| \| \|	This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9.
* \|	Merge branch 'more-markdown-extensions' into 'master'	Stan Hu	2015-08-12	3	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markup_helper: detect .mkd and .mkdn as markdown See merge request !1148
\| * \|	markup_helper: detect .mkd and .mkdn as markdown	Ben Boeckel	2015-08-12	3	-2/+3
\| \|/
* \|	Merge branch 'mr-merge-manually-2' into 'master'	Dmitriy Zaporozhets	2015-08-12	3	-13/+9
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move merge manually text below merge widget Replace !1121 Screenshot: #### Before ![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png) #### After ![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png) See merge request !1141
\| *	Fix changelogmr-merge-manually-2	Dmitriy Zaporozhets	2015-08-11	1	-3/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Move merge manually text below merge widget	Dmitriy Zaporozhets	2015-08-11	2	-10/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge pull request #9545 from Baldinof/add_merged_label	Dmitriy Zaporozhets	2015-08-12	4	-0/+37
\|\ \ \| \|/ \|/\|	Add merged label on branches page
\| *	Add merged label on branches page	Florent (HP)	2015-08-11	4	-0/+37
\|/
*	Merge branch 'check-out-branch-button' into 'master'	Dmitriy Zaporozhets	2015-08-11	4	-11/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
\| *	Merge branch 'master' into check-out-branch-buttoncheck-out-branch-button	Douwe Maan	2015-08-10	43	-115/+320
\| \|\
\| * \|	Fix spec	Douwe Maan	2015-08-10	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' into check-out-branch-button	Douwe Maan	2015-08-09	11	-22/+52
\| \|\ \
\| * \| \|	Fix changelog.	Douwe Maan	2015-08-08	1	-2/+0
\| \| \| \|
\| * \| \|	Add "Check out branch" button to the MR page.	Douwe Maan	2015-08-08	3	-10/+23
\| \| \| \|
* \| \| \|	Merge branch 'improve-merge-request-widget' into 'master'	Dmitriy Zaporozhets	2015-08-11	21	-250/+224
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve merge request widget Return merge request widget improvements that were reverted with satellites See merge request !1140
\| * \| \| \|	Merge branch 'mr-widget-text' into 'master'	Dmitriy Zaporozhets	2015-08-11	18	-98/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve text of MR merge widget and manual merge modal Modal with manual merge instructions: ![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png) Archived: ![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png) WIP: ![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png) Missing target branch: ![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png) Missing source branch: ![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png) Nothing to merge: ![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png) Checking ability to merge: ![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png) Conflicts when allowed to merge: ![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png) Conflicts when not allowed to merge: ![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png) Mergeable when allowed to merge: ![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png) Mergeable when not allowed to merge: ![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png) Merge in progress: ![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png) Merge failed: ![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png) Merged: ![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png) Closed: ![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png) cc @dzaporozhets @rspeicher See merge request !1120
\| * \| \| \|	Move command line insturction out of mr widget	Dmitriy Zaporozhets	2015-08-11	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Refactor merge request widget	Dmitriy Zaporozhets	2015-08-11	7	-117/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Move command line insturction out of mr widget	Dmitriy Zaporozhets	2015-08-11	3	-38/+30
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'optimize-haml-textarea-rendering' into 'master'	Dmitriy Zaporozhets	2015-08-11	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984
\| * \| \| \|	Bump Haml to 4.0.7 to speed up textarea rendering	Stan Hu	2015-08-10	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1987
* \| \| \| \|	Merge branch 'grit_blame' into 'master'	Dmitriy Zaporozhets	2015-08-11	6	-24/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fast blame Improve performance for file blame page. Also bring some small UI improvements See merge request !1129
\| * \| \| \| \|	Small UI improvements to git blame page	Dmitriy Zaporozhets	2015-08-11	3	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	update gitlab_gitgrit_blame	Valery Sizov	2015-08-11	2	-11/+7
\| \| \| \| \| \|
\| * \| \| \| \|	link to the local gitlab_git	Valery Sizov	2015-08-11	2	-8/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Fast blame	Valery Sizov	2015-08-11	2	-14/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'drop-username-tree-row' into 'master'	Dmitriy Zaporozhets	2015-08-11	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop the user name from tree row to improve readability of commit messages Follow up to MR !579 /cc @dzaporozhets See merge request !1124
\| * \| \| \| \| \|	Drop the user name from tree row to improve readability of commit messages	Sven Strickroth	2015-08-09	1	-1/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sven Strickroth <email@cs-ware.de>
* \| \| \| \| \|	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2015-08-11	2	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link username to profile on Group Members page When browsing a GitLab group, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless. See merge request !1099
\| * \| \| \| \| \|	Link username to profile on Group Members page	Tom Webster	2015-08-10	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When browsing GitLab, a user may want to view a particular user's other contributions or profile information. This link helps make that process seamless.
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-11	107	-879/+1712
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'revert-satellites' into 'master'	Dmitriy Zaporozhets	2015-08-11	100	-844/+1670
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
\| \| * \| \| \| \| \| \|	Fix file api tests	Dmitriy Zaporozhets	2015-08-11	1	-22/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Fix editing files via API"	Dmitriy Zaporozhets	2015-08-11	1	-26/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7bde6ae540bab5c93a83bfe26102674adba0eab5.
\| \| * \| \| \| \| \| \|	Revert "Merge branch 'web-editor-rugged' into 'master'"	Dmitriy Zaporozhets	2015-08-11	7	-13/+266
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Fix gemfilerevert-satellites	Dmitriy Zaporozhets	2015-08-11	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Create and edit files in web editor via rugged"	Dmitriy Zaporozhets	2015-08-11	4	-81/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Fix adding new file to empty repo"	Dmitriy Zaporozhets	2015-08-11	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 27a158506e033acd7195acf91995c1574e122832. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Use rugged in web editor for base64 encoding"	Dmitriy Zaporozhets	2015-08-11	2	-28/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 541133197be098732cdc14a12aa059e21cac3d71.
\| \| * \| \| \| \| \| \|	Revert "Create activity event and execute hooks on web editor commit"	Dmitriy Zaporozhets	2015-08-11	3	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3d416f1682c5e6a6ac1ea7013f66bbd0d23b452c.
\| \| * \| \| \| \| \| \|	Revert "Make web editor work correctly after switch from satellites"	Dmitriy Zaporozhets	2015-08-11	5	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758.
\| \| * \| \| \| \| \| \|	Revert "Refactor web editor"	Dmitriy Zaporozhets	2015-08-11	7	-120/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Remove changelog items	Dmitriy Zaporozhets	2015-08-11	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Fix conflict issue	Dmitriy Zaporozhets	2015-08-11	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Merge branches inside one repository using rugged instead of satellites"	Dmitriy Zaporozhets	2015-08-11	3	-62/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d24c40ec219d76e01e2fab5f6ebf431adae91bdd.
\| \| * \| \| \| \| \| \|	Revert "Merge branch 'refactor-can-be-merge' into 'master'"	Dmitriy Zaporozhets	2015-08-11	3	-24/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing changes made to 804168e1def1204af712febb229f41a3865f085f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	67	-349/+1069
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Revert "Merge branch 'improve-merge-requests' into 'master' "	Dmitriy Zaporozhets	2015-08-11	13	-154/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.