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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Capitalize js class namecapitalize-js-class	Dmitriy Zaporozhets	2015-03-25	2	-2/+2
\|
*	Merge branch 'fix-compare-diff-unfold' into 'master'	Dmitriy Zaporozhets	2015-03-26	4	-0/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code unfold not working on Compare commits page ### What does this MR do? The code unfold buttons (`...`) don't work when you go to Commits -> Compare mode. This MR fixes that. ### Are there points in the code the reviewer needs to double check? Check to make sure all the right initializers are run in the `projects:compare:xxx` case. I'm also not sure if there are other cases where a diff is shown but the code unfolding is not activated. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? Closes #1274 See merge request !434
\| *	Fix code unfold not working on Compare commits page	Stan Hu	2015-03-24	4	-0/+20
\| \| \| \| \| \| \| \|	Closes #1274
* \|	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2015-03-26	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change ordering so that confirm is removed from attrs before attempting to User.build_user Possible fix gitlab-org/gitlab-ce#1296 See merge request !445
\| * \|	Change ordering so that confirm is removed from attrs before attempting to ↵	RICKETTM@uk.ibm.com	2015-03-24	1	-2/+2
\| \|/ \| \| \| \| \| \|	User.build_user
* \|	Merge branch 'doc_group_permissions' into 'master'	Dmitriy Zaporozhets	2015-03-26	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[doc] Groups can be browsable if they contain at least one public project. See merge request !451
\| * \|	[doc] Groups can be browsable if they contain at least one public project.	Achilleas Pipinellis	2015-03-25	1	-2/+5
\| \| \|
* \| \|	Merge branch 'notification_on_project_moving' into 'master'	Dmitriy Zaporozhets	2015-03-26	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notification on project moving Moving of project should respect notification settings https://dev.gitlab.org/gitlab/gitlabhq/issues/2091 See merge request !452
\| * \| \|	notification on project movingnotification_on_project_moving	Valery Sizov	2015-03-25	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'fix-branch-contains' into 'master'	Dmitriy Zaporozhets	2015-03-26	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent doubling AJAX request with each commit visit via Turbolink Be careful with `document.ready` in views :smiley: cc @vsizov @marin See merge request !454
\| * \| \| \|	Prevent doubling AJAX request with each commit visit via Turbolinkfix-branch-contains	Dmitriy Zaporozhets	2015-03-25	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #9021 from nicklegr/faster_auto_merge	Dmitriy Zaporozhets	2015-03-25	2	-5/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Faster merge request processing for large repository
\| * \| \| \|	Update CHANGELOG	nicklegr	2015-03-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Reset parking branch to HEAD everytime	nicklegr	2015-03-25	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Reduces overhead of git checkout
* \| \| \| \|	Merge pull request #8007 from mr-vinn/markdown-tags	Dmitriy Zaporozhets	2015-03-25	5	-10/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow HTML tags in user Markdown input
\| * \ \ \ \	Merge branch 'master' into markdown-tags	Vinnie Okada	2015-03-24	85	-530/+829
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into markdown-tags	Vinnie Okada	2015-03-22	46	-141/+466
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix SanitizationFilter bugs	Vinnie Okada	2015-03-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a `SafeBuffer` instead of a `String` from the `#gfm_with_options` method so that Rails doesn't escape our markup. Also add `<span>` to the sanitization whitelist to avoid breaking syntax highlighting in code blocks.
\| * \| \| \| \| \| \|	Merge branch 'master' into markdown-tags	Vinnie Okada	2015-03-21	131	-1414/+1117
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge updated CHANGELOG entries
\| * \| \| \| \| \| \| \|	Don't allow style attributes in inline HTML	Vinnie Okada	2015-03-21	2	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change HTML sanitization	Vinnie Okada	2015-03-19	3	-72/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the `SanitizationFilter` class from the html-pipeline gem for inline HTML instead of calling the Rails `sanitize` method.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into markdown-tags	Vinnie Okada	2015-03-17	1442	-16375/+37368
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the latest HTML pipeline gem
\| * \| \| \| \| \| \| \| \|	Document whitelisted HTML tags and attributes	Vinnie Okada	2014-10-10	1	-0/+59
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow HTML tags in user Markdown input	Vinnie Okada	2014-10-10	3	-2/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow whitelisted tags to appear in rendered HTML output by disabling Redcarpet's `:filter_html` option.
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-25	12	-25/+29
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'more-rubocop-styles' into 'master'	Dmitriy Zaporozhets	2015-03-25	11	-22/+25
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More rubocop styles See merge request !449
\| \| * \| \| \| \| \| \| \| \|	Style/RedundantReturn enabledmore-rubocop-styles	Dmitriy Zaporozhets	2015-03-24	7	-10/+13
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Enable more rubocop style checks	Dmitriy Zaporozhets	2015-03-24	6	-13/+13
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Hannes Rosenögger	2015-03-25	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation - Markdown - added missing line-break info as promised, I updated the Markdown documentation with the line-breaks info See merge request !186
\| \| * \| \| \| \| \| \| \|	how to render line-breaks	Dmitri Goosens	2014-09-17	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix changelog for 7.9	Robert Schilling	2015-03-25	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-task	Robert Schilling	2015-03-25	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Fix GitLab shell setup spacing
\| * \| \| \| \| \| \| \| \|	Fix newline spacing after authorized_keys rebuild	Andrew Tomaka	2015-03-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-internal-errors' into 'master'	Dmitriy Zaporozhets	2015-03-25	14	-94/+134
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respond with full GitAccess error if user has project read access. Should help with debugging #1236. cc @marin See merge request !437
\| * \| \| \| \| \| \| \| \| \|	Respond with full GitAccess error if user has project read access.api-internal-errors	Douwe Maan	2015-03-24	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor GitAccess to use instance variables.	Douwe Maan	2015-03-24	13	-93/+132
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-sticky-header' into 'master'	Dmitriy Zaporozhets	2015-03-25	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve sticky headers in diffs * disable sticky headers in discussion * enable sticky header on mr page with you click changes tab See merge request !450
\| * \| \| \| \| \| \| \| \|	Improve sticky headers in diffsfix-sticky-header	Dmitriy Zaporozhets	2015-03-24	2	-7/+7
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* disable sticky headers in discussion * enable sticky header on mr page with you click changes tab
* \| \| \| \| \| \| \| \|	Merge branch 'milestone_and_labels_links' into 'master'	Dmitriy Zaporozhets	2015-03-25	2	-6/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestones and labels can be used even when issues are disabled. When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests. See merge request !1739
\| * \| \| \| \| \| \| \| \|	Milestones and labels can be used even when issues are disabled.	Marin Jankovski	2015-03-24	2	-6/+7
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mr-button-color' into 'master'	Dmitriy Zaporozhets	2015-03-24	2	-18/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change merge request button color based on CI status Green button looks confusing when CI fails Screenshots: ![ci-warn](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8166c9acf35f9d886f37f52f975acfb/ci-warn.png) ![ci-can](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d7319c4c567c42a47d79953191384f96/ci-can.png) See merge request !448
\| * \| \| \| \| \| \| \| \|	Change merge request button color based on CI status	Dmitriy Zaporozhets	2015-03-24	2	-18/+12
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'note-avatar-link' into 'master'	Dmitriy Zaporozhets	2015-03-24	3	-3/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link note avatar to user. See merge request !446
\| * \| \| \| \| \| \| \| \| \|	Link note avatar to user.note-avatar-link	Douwe Maan	2015-03-24	3	-3/+7
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'user-subscriptions-dependent' into 'master'	Dmitriy Zaporozhets	2015-03-24	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up subscriptions when user is deleted. cc @vsizov See merge request !439
\| * \| \| \| \| \| \| \| \| \|	Clean up subscriptions when user is deleted.user-subscriptions-dependent	Douwe Maan	2015-03-24	1	-0/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-rugments' into 'master'	Dmitriy Zaporozhets	2015-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rugments to 1.0.0.beta6 to fix C# highlighting. Fixes #1259. See merge request !435
\| * \| \| \| \| \| \| \| \| \|	Update rugments to 1.0.0.beta6 to fix C# highlighting.update-rugments	Douwe Maan	2015-03-24	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-03-24	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge pull request #9012 from dantudor/patch-1	Dmitriy Zaporozhets	2015-03-24	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Unescape branch param to delete