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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix_relative_position_calculation' into 'master'	Douwe Maan	2017-03-14	1	-26/+64
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix relative position calculation Closes #29269 See merge request !9837
\| *	[Issue sorting]Addressed review commentsfix_relative_position_calculation	Valery Sizov	2017-03-14	1	-23/+54
\| \|
\| *	[Issue sorting] Filling positions preferable in the middle	Valery Sizov	2017-03-14	1	-10/+13
\| \|
\| *	Fix relative position calculation	Valery Sizov	2017-03-14	1	-8/+12
\| \|
* \|	Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master'	Sean McGivern	2017-03-14	4	-9/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714
\| * \|	Update API on frontend to use v428864-use-the-v4-api-from-the-frontend	Sam Rose	2017-03-14	4	-9/+9
\| \|/ \| \| \| \| \| \|	Use options object to pass params for project endpoint
* \|	Merge branch '29389-fix-already-initialized-constants' into 'master'	Robert Speicher	2017-03-14	1	-2/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899
\| * \|	Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants	Rémy Coutable	2017-03-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'nonewline-parser' into 'master'	Sean McGivern	2017-03-14	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705
\| * \| \|	take nonewline context into account in diff parser	mhasbini	2017-03-13	2	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'fix/gb/dashboard-commit-status-caching' into 'master'	Sean McGivern	2017-03-14	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve fragment caching rules at projects dashboard Closes #28364 See merge request !9895
\| * \| \|	Improve fragment caching rules at projects dashboard	Grzegorz Bizon	2017-03-13	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master'	Sean McGivern	2017-03-14	7	-20/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836
\| * \| \| \|	Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestones	Alex Braha Stoll	2017-03-10	7	-20/+38
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Stan Hu	2017-03-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28743-actionview-template-error-execjs-disabled-_issuable_meta_data' into 'master' Fix 'ExecJS disabled' error on issues index Closes #28743 See merge request !9916
\| * \| \| \| \|	Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_data	James Edwards-Jones	2017-03-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Occurred in production when an issue had an associated MR
* \| \| \| \| \|	Use a button and a post request instead of UJS links - part 1 - Environments	Filipa Lacerda	2017-03-14	16	-117/+247
\|/ / / / /
* \| \| \| \|	Fix missing blob line permalink updater on blob:showfix-missing-blob-permalink-updater-on-blob-show	Eric Eastwood	2017-03-13	1	-23/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9461#note_25288831
* \| \| \| \|	Merge branch 'remove-iifes-1' into 'master' 29399-add-documentation-workflow-to-ci	Alfredo Sumaran	2017-03-13	35	-3748/+3683
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IIFEs for several JS files - Part 1 See merge request !9884
\| * \| \| \| \|	fix broken variable referenceremove-iifes-1	Mike Greiling	2017-03-13	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	remove IIFEs in preparation for ES module refactor	Mike Greiling	2017-03-13	35	-3748/+3683
\| \| \| \| \| \|
* \| \| \| \| \|	Organize our polyfills and standardize on core-js	Mike Greiling	2017-03-13	19	-113/+72
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/custom-lfs' into 'master'	Douwe Maan	2017-03-13	3	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779
\| * \| \| \| \| \|	Do not show LFS object when LFS is disabled	Christopher Bartz	2017-03-13	3	-4/+8
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly.
* \| \| \| \| \|	Merge branch 'handle-failure-when-deleting-tags' into 'master'	Douwe Maan	2017-03-13	3	-5/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display error message when deleting tag in web UI fails See merge request !9906
\| * \| \| \| \| \|	Display error message when deleting tag in web UI failshandle-failure-when-deleting-tags	Adam Niedzielski	2017-03-13	3	-5/+23
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵	Alfredo Sumaran	2017-03-13	5	-14/+52
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update permalink/blame buttons with line number fragment hash Closes #19742 See merge request !9461
\| * \| \| \| \| \|	Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-links	Eric Eastwood	2017-03-13	5	-14/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742
* \| \| \| \| \| \|	Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master'	Douwe Maan	2017-03-13	18	-63/+209
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a new issue for a single discussion See merge request !8266
\| * \| \| \| \| \|	Move `ResolveDiscussions` into `concerns/issues` folder	Bob Van Landuyt	2017-03-13	1	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Check `service.discussion_to_resolve_id` to decide content of flash	Bob Van Landuyt	2017-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That way the check is the same in the service & the controller
\| * \| \| \| \| \|	Update copy	Bob Van Landuyt	2017-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One comments on something, not in something
\| * \| \| \| \| \|	Rename variable	Bob Van Landuyt	2017-03-13	9	-27/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
\| * \| \| \| \| \|	Pass the discussion to resolve after verifying captcha	Bob Van Landuyt	2017-03-13	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Renamed `.js.es6` to `.js`	Bob Van Landuyt	2017-03-13	1	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Indicate that `single_discussion` is optional	Bob Van Landuyt	2017-03-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Separate flash messages for resolving one or multiple discussions	Bob Van Landuyt	2017-03-13	1	-3/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Show correct message when user cannot resolve discussions	Bob Van Landuyt	2017-03-13	1	-2/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Replace the warning with an info icon	Bob Van Landuyt	2017-03-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make sure the for a merge request only gets executed once.	Bob Van Landuyt	2017-03-13	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fit 'unresolved discussion widget together	Bob Van Landuyt	2017-03-13	2	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a flash messages when an issue resolving discussions is created	Bob Van Landuyt	2017-03-13	1	-1/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Build link to discussions to resolve in a helper	Bob Van Landuyt	2017-03-13	2	-3/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update copy	Bob Van Landuyt	2017-03-13	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up `discussions_to_resolve`-method	Bob Van Landuyt	2017-03-13	1	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move `resolve_discussions_with_issue` to `Issues::CreateService`	Bob Van Landuyt	2017-03-13	2	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't filter params and merge them back in later	Bob Van Landuyt	2017-03-13	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By building the issue before filtering
\| * \| \| \| \| \|	Correctly indent quotes in new issue description	Bob Van Landuyt	2017-03-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By using `>`-quote style instead of `>>>`. Also: Update documentation images.
\| * \| \| \| \| \|	Better variable names	Bob Van Landuyt	2017-03-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So the title doesn't seem to be set _on_ a merge request.
\| * \| \| \| \| \|	No need to look up the notable separately in the ResolveService	Bob Van Landuyt	2017-03-13	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The merge request will now always be there when the discussion was resolved by creating a new issue.