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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Correctly find last known blob for file deleted in MR.merge-request-deleted-file	Douwe Maan	2015-10-20	9	-19/+38
\|
*	Merge branch 'notify-footer' into 'master'	Robert Speicher	2015-10-19	1	-0/+4
\|\ \| \| \| \| \| \| \| \|	Restore notification footer text See merge request !1640
\| *	Restore notification footer text.notify-footer	Douwe Maan	2015-10-18	1	-0/+4
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-10-19	1	-1/+0
\|\ \
\| * \	Merge branch 'fix-code-leading-indent' into 'master'	Dmitriy Zaporozhets	2015-10-19	1	-1/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some padding from code blocks This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else. ![Screen_Shot_2015-10-14_at_2.40.38_PM](https://gitlab.com/pioto/gitlab-ce/uploads/5434eb077c17e56528a94079afe3c732/Screen_Shot_2015-10-14_at_2.40.38_PM.png) See merge request !1596
\| \| * \|	Remove some padding from code blocks	Mike Kelly	2015-10-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.
* \| \| \|	Merge branch 'add-files-optionto-changelog'	Dmitriy Zaporozhets	2015-10-19	2	-0/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add changelog itemadd-files-optionto-changelog	Douwe Maan	2015-10-19	2	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'user-page-new-ui' into 'master'	Dmitriy Zaporozhets	2015-10-19	7	-39/+112
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
\| * \| \| \|	Partly implement new UI for user pageuser-page-new-ui	Dmitriy Zaporozhets	2015-10-16	7	-39/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'milestone-issue-sorting-performance' into 'master'	Yorick Peterse	2015-10-19	5	-5/+79
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of sorting milestone issues This will fix the problem described in #3066. See merge request !1609
\| * \| \| \|	Improve performance of sorting milestone issues	Yorick Peterse	2015-10-19	5	-5/+79
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This cuts down the time it takes to sort issues of a milestone by about 10x. In the previous setup the code would run a SQL query for every issue that had to be sorted. The new setup instead runs a single SQL query to update all the given issues at once. The attached benchmark used to run at around 60 iterations per second, using the new setup this hovers around 600 iterations per second. Timing wise a request to update a milestone with 40-something issues would take about 760 ms, in the new setup this only takes about 130 ms. Fixes #3066
* \| \| \|	Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵	Douwe Maan	2015-10-19	11	-27/+146
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
\| * \| \| \|	Move changelog item to 8.2	Douwe Maan	2015-10-19	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Fix spechanloong/gitlab-ce-remove-forks-from-projects-settings	Douwe Maan	2015-10-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Tweak wording.	Douwe Maan	2015-10-18	4	-19/+21
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into remove-forks-from-projects-settings	Han Loong Liauw	2015-10-17	251	-1520/+3574
\| \|\ \ \ \
\| * \| \| \| \|	Made suggested content changes based on MR Review	Han Loong Liauw	2015-10-14	8	-39/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
\| * \| \| \| \|	Merge branch 'master' into remove-forks-from-projects-settings	Han Loong Liauw	2015-10-13	43	-330/+348
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Adds ability to remove the forked relationship	Han Loong Liauw	2015-10-13	10	-7/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
* \| \| \| \| \| \|	Merge branch 'close-issues-by-mr' into 'master'	Robert Speicher	2015-10-19	2	-0/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Close issues mentioned in MR description when MR is merged using fast-forward merge or when merge commit message is edited. Fixes gitlab-org/gitlab-ee#48. See merge request !1639
\| * \| \| \| \| \| \|	Fix bug preventing mentioned issued from being closed when MR is merged ↵close-issues-by-mr	Douwe Maan	2015-10-18	2	-0/+11
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using fast-forward merge.
* \| \| \| \| \| \|	Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master'	Dmitriy Zaporozhets	2015-10-19	22	-98/+131
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to select the Files view as default project view ![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png) Also shows the readme at the very bottom, like on the regular Files page. Replaces !1489. Closes #2655. See merge request !1632
\| * \| \| \| \| \| \|	Fix readme speccristianbica/gitlab-ce-user-project-view-files	Douwe Maan	2015-10-18	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only load tree when project has repository to prevent 404	Douwe Maan	2015-10-18	1	-1/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make spec names more clear	Douwe Maan	2015-10-17	1	-3/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tweak help text.	Douwe Maan	2015-10-17	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Put grey block around blob ref switcher and breadcrumb.	Douwe Maan	2015-10-17	2	-17/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove border at bottom of readme.	Douwe Maan	2015-10-17	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tweak styling of project home files list.	Douwe Maan	2015-10-17	2	-14/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use same style for project readme, tree readme and regular blob.	Douwe Maan	2015-10-17	3	-19/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Split up projects/tree/_tree partial.	Douwe Maan	2015-10-17	3	-38/+37
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Set vars used by tree view in project show action.	Douwe Maan	2015-10-17	1	-4/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove redundant helper method.	Douwe Maan	2015-10-17	2	-12/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move last push info at top of project page.	Douwe Maan	2015-10-17	3	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files	Douwe Maan	2015-10-17	602	-5378/+8831
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Allow users to select the Files view as default project view	Cristian Bica	2015-10-01	9	-52/+96
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'hash-block-return' into 'master'	Robert Speicher	2015-10-19	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where a push would only create cross references from the first commit. Apparently we can't `return` from a `Hash.new` block. Who knew. See merge request !1638
\| * \| \| \| \| \| \| \| \|	Fix bug where a push would only create cross references from the first commit.hash-block-return	Douwe Maan	2015-10-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9744 from jamierocks/patch-1	Stan Hu	2015-10-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|	Fix spelling of Description
\| * \| \| \| \| \| \| \| \|	Fix spelling of Description	Jamie Mansfield	2015-10-18	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'cross-reference-mr-on-issues' into 'master'	Douwe Maan	2015-10-18	13	-7/+88
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
\| * \| \| \| \| \| \| \|	Merge branch 'master' into cross-reference-mr-on-issueszj/gitlab-ce-cross-reference-mr-on-issues	Zeger-Jan van de Weg	2015-10-16	9	-19/+127
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Only accept open issues and merge requests	Zeger-Jan van de Weg	2015-10-16	10	-19/+62
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Show merge requests which close current issue	Zeger-Jan van de Weg	2015-10-16	9	-2/+40
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'outdated-discussion-padding' into 'master'	Dmitriy Zaporozhets	2015-10-17	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix padding of outdated discussion item. Old: ![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png) New: ![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png) It still looks the same when the discussion is expanded. See merge request !1614
\| * \| \| \| \| \| \| \| \| \|	Fix padding of outdated discussion item.outdated-discussion-padding	Douwe Maan	2015-10-16	2	-1/+5
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-issue-3067' into 'master'	Dmitriy Zaporozhets	2015-10-17	2	-6/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix nonatomic database update potentially causing project star counts to go negative The `counter_cache` decrement function is called when a project star is deleted, but there was no guarantee multiple workers would not attempt to delete the same item simultaneously. Use an atomic update to prevent the count from going negative. Note: I was only able to duplicate the issue on GitLab.com, but I haven't been able to replicate it anywhere else. Presumably this bug happens when the `WHERE` clause takes some time to search for the right entry and multiple requests get sent simultaneously. Need to verify whether this fix truly solves the issue. Closes #3067 See merge request !1628
\| * \| \| \| \| \| \| \| \|	Fix nonatomic database update potentially causing project star counts to go ↵	Stan Hu	2015-10-17	2	-6/+10
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	negative The counter_cache decrement function is called when a project star is deleted, but there was no guarantee multiple workers would not attempt to delete the same item simultaneously. Use an atomic update to prevent the count from going negative. Closes #3067
* \| \| \| \| \| \| \| \|	Merge branch 'rs-redactor-filter' into 'master'	Douwe Maan	2015-10-17	44	-476/+810
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090