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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|
* \|	Merge branch 'use-corejs-polyfills' into 'master'	Alfredo Sumaran	2017-03-13	37	-238/+125
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Organize our polyfills and standardize on core-js See merge request !9749
\| * \|	Organize our polyfills and standardize on core-js	Mike Greiling	2017-03-13	37	-238/+125
\|/ /
* \|	Merge branch 'feature/custom-lfs' into 'master'	Douwe Maan	2017-03-13	8	-34/+83
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-34/+83
\| \|/ \| \| \| \| \| \| \| \| \| \|	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 ↵	Robert Speicher	2017-03-13	4	-1/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28492-add-dev-documentation-for-using-the-queryrecorder-in-specs' into 'master' Adds docs for QueryRecorder tests Closes #28492 See merge request !9838
\| * \|	Adds docs for QueryRecorder tests28492-add-dev-documentation-for-using-the-queryrecorder-in-specs	James Edwards-Jones	2017-03-13	4	-1/+35
\| \| \|
* \| \|	Merge branch 'handle-failure-when-deleting-tags' into 'master'	Douwe Maan	2017-03-13	5	-11/+48
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-11/+48
\| \| \| \|
* \| \| \|	Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵	Alfredo Sumaran	2017-03-13	8	-28/+157
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	8	-28/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	41	-206/+759
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a new issue for a single discussion See merge request !8266
\| * \| \| \| \|	Don't instrument `app/services/concerns`	Bob Van Landuyt	2017-03-13	1	-7/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Make API v3 work with the new param name	Bob Van Landuyt	2017-03-13	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move `ResolveDiscussions` into `concerns/issues` folder	Bob Van Landuyt	2017-03-13	2	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	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	19	-65/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-15/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Show correct message when user cannot resolve discussions	Bob Van Landuyt	2017-03-13	3	-79/+114
\| \| \| \| \| \|
\| * \| \| \| \|	Replace the warning with an info icon	Bob Van Landuyt	2017-03-13	3	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Make sure the for a merge request only gets executed once.	Bob Van Landuyt	2017-03-13	2	-1/+22
\| \| \| \| \| \|
\| * \| \| \| \|	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	3	-1/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Build link to discussions to resolve in a helper	Bob Van Landuyt	2017-03-13	3	-3/+48
\| \| \| \| \| \|
\| * \| \| \| \|	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	4	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The merge request will now always be there when the discussion was resolved by creating a new issue.
\| * \| \| \| \|	Finding discussions in NotesFinder is no longer required.	Bob Van Landuyt	2017-03-13	2	-17/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the MergeRequest is now a required param for resolving discussions
\| * \| \| \| \|	Optimize finding `discussions_to_resolve`	Bob Van Landuyt	2017-03-13	1	-5/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Link 'discussion' instead of date	Bob Van Landuyt	2017-03-13	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the date would be wrong for people in different timezones.
\| * \| \| \| \|	Make API v3 compatible with the changes in `Issues::CreateService`	Bob Van Landuyt	2017-03-13	1	-6/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Move functionality for resolving discussions into a concern	Bob Van Landuyt	2017-03-13	6	-42/+54
\| \| \| \| \| \|
\| * \| \| \| \|	Update copy for warning on new issue form	Bob Van Landuyt	2017-03-13	1	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add a button to delegate all discussions in a merge request	Bob Van Landuyt	2017-03-13	6	-24/+82
\| \| \| \| \| \|
\| * \| \| \| \|	Always require MR-iid for resolving discussions	Bob Van Landuyt	2017-03-13	17	-187/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
\| * \| \| \| \|	Simplify NotesFinder discussion query	Bob Van Landuyt	2017-03-13	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Delegate a single discussion to a new issue	Bob Van Landuyt	2017-03-13	31	-113/+571
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* \| \| \| \| \|	Merge branch '29242-fix-api-specs-potential-weird-failures-on-retries' into ↵	Robert Speicher	2017-03-13	5	-8/+24
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Implement `json_response` as a `let` variable Closes #29242 See merge request !9825
\| * \| \| \| \|	Retry only on feature specs that use JS, on CI29242-fix-api-specs-potential-weird-failures-on-retries	Rémy Coutable	2017-03-13	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>