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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Include nested group into destroy_service_specsh-async-delete-children	Dmitriy Zaporozhets	2017-02-27	1	-0/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Make nested groups deletion synchronous to avoid potential race	Stan Hu	2017-02-27	1	-1/+2
\|
*	Merge branch 'add-quotes-to-coverage-pattern' into 'master' improve-backoff-algo	Grzegorz Bizon	2017-02-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Add quotes to coverage pattern See merge request !9545
\| *	Add quotes to coverage pattern	Max Raab	2017-02-27	1	-1/+1
\|/
*	Merge branch 'backoff-algo-backport-ee' into 'master'	Jacob Schatz	2017-02-26	1	-0/+52
\|\ \| \| \| \| \| \| \| \|	Adds backoff algo from EE to CE See merge request !9517
\| *	Adds backoff algo from EE to CEbackoff-algo-backport-ee	Filipa Lacerda	2017-02-24	1	-0/+52
\| \|
* \|	Merge branch 'update-vue-2.1' into 'master'	Fatih Acet	2017-02-26	4	-5/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Vue to v2.1 See merge request !9386
\| * \|	add CHANGELOG.md entry for !9386update-vue-2.1	Mike Greiling	2017-02-20	1	-0/+4
\| \| \|
\| * \|	use CommonJS vue distribution	Mike Greiling	2017-02-20	1	-1/+1
\| \| \|
\| * \|	upgrade Vue from v2.0.3 to v2.1.10	Mike Greiling	2017-02-20	2	-7/+7
\| \| \|
* \| \|	Merge branch 'pedro-mattermost-slack-notifications-text' into 'master'	Kamil Trzciński	2017-02-26	6	-23/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clearer placeholders and channel definition for Mattermost and Slack notifications services See merge request !9139
\| * \ \	Merge branch 'pedro-mattermost-slack-notifications-text' of ↵pedro-mattermost-slack-notifications-text	Pedro Moreira da Silva	2017-02-24	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into pedro-mattermost-slack-notifications-text
\| \| * \| \|	Update docs on Mattermost and Slack notifications channels	Pedro Moreira da Silva	2017-02-10	4	-9/+12
\| \| \| \| \|
\| \| * \| \|	Add clearer placeholders and channel definition.	Pedro Moreira da Silva	2017-02-10	2	-14/+14
\| \| \| \| \|
\| * \| \| \|	Update docs on Mattermost and Slack notifications channels	Pedro Moreira da Silva	2017-02-24	4	-9/+12
\| \| \| \| \|
\| * \| \| \|	Add clearer placeholders and channel definition.	Pedro Moreira da Silva	2017-02-24	2	-14/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master'	Robert Speicher	2017-02-25	4	-51/+123
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Git history follow renames again by performing the --skip in Ruby Closes #23062 See merge request !9314
\| * \| \| \| \|	Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skip	Rémy Coutable	2017-02-23	2	-84/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Make Git history follow renames again by performing the --skip in Ruby	Rémy Coutable	2017-02-23	4	-23/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This hack is needed because of an issue when --follow and --skip are passed to git log at the same time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'patch-14' into 'master'	Allison Whilden	2017-02-25	1	-17/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update users.md See merge request !9475
\| * \| \| \| \| \|	Update users.md	Sarah O'Donnell	2017-02-23	1	-17/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-fix-web-edit-new-lines' into 'master'	Robert Speicher	2017-02-24	28	-787/+497
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207
\| * \| \| \| \| \| \|	Fix specdm-fix-web-edit-new-lines	Douwe Maan	2017-02-24	4	-82/+26
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add newline	Douwe Maan	2017-02-24	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	We don't need these checks anymore	Douwe Maan	2017-02-24	1	-19/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Raise error when no content is provided	Douwe Maan	2017-02-24	4	-9/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Address review	Douwe Maan	2017-02-24	5	-25/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update API v3 in line with v4	Douwe Maan	2017-02-24	1	-7/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix new offenses	Douwe Maan	2017-02-24	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix spec	Douwe Maan	2017-02-24	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix specs	Douwe Maan	2017-02-24	2	-3/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename commit_file, commit_dir and remove_file and update specs	Douwe Maan	2017-02-24	16	-102/+86
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistently create, update, and delete files, taking CRLF settings into account	Douwe Maan	2017-02-24	12	-596/+376
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '28419-ask-confirmation-cancel' into 'master'	Fatih Acet	2017-02-24	1	-1/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds confirmation for cancel button Closes #28419 See merge request !9519
\| * \| \| \| \| \| \| \|	Adds confirmation for cancel button28419-ask-confirmation-cancel	Filipa Lacerda	2017-02-24	1	-1/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'moving-issue-with-two-list-labels' into 'master'	Alfredo Sumaran	2017-02-24	4	-5/+37
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes label from previous list Closes #28484 See merge request !9418
\| * \| \| \| \| \| \| \| \|	Removes label from previous listmoving-issue-with-two-list-labels	Phil Hughes	2017-02-21	4	-5/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When dragging an issue to a list that it already exists in it was previously not removing the label for the list it was moving from. This changes that to make that API call. Closes #28484
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-require-context-application-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-11/+170
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from application.js See merge request !9491
\| * \| \| \| \| \| \| \| \| \|	add missing require statement and don't require selfremove-require-context-application-bundle	Mike Greiling	2017-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	remove require.context from application.js	Mike Greiling	2017-02-23	1	-11/+170
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'user-callouts' into 'master'	Filipa Lacerda	2017-02-24	10	-0/+185
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added user-callouts Closes #27269 See merge request !9249
\| * \| \| \| \| \| \| \| \| \| \|	Corrected indentation on the template stringuser-callouts	Jose Ivan Vargas	2017-02-24	1	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removed eslint disabled rules
\| * \| \| \| \| \| \| \| \| \| \|	Fix failing specs	Alfredo Sumaran	2017-02-23	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Modified the user_callout behaviour	Jose Ivan Vargas	2017-02-23	7	-45/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it appends a template instead of relying in a partial to show it.
\| * \| \| \| \| \| \| \| \| \| \|	Removed disabled rules from the user_callout_spec.js	Jose Ivan Vargas	2017-02-23	4	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line
\| * \| \| \| \| \| \| \| \| \| \|	Moved the dismiss-icon listener to close the callout to a button	Jose Ivan Vargas	2017-02-23	5	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Changed the javascript class from using the global scope to exporting it via ↵	Jose Ivan Vargas	2017-02-23	9	-78/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	webpack Also improved accesibility and change the id from user_callouts to a class
\| * \| \| \| \| \| \| \| \| \| \|	Added CHANGELOG and corrected linter errors	Jose Ivan Vargas	2017-02-23	5	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Created unit tests, fixtures and integration tests	Jose Ivan Vargas	2017-02-23	10	-33/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the user_callout haml to a partial and added the corresponding SVG icon
\| * \| \| \| \| \| \| \| \| \| \|	Initial version of the user-callouts	Jose Ivan Vargas	2017-02-23	5	-2/+83
\| \| \| \| \| \| \| \| \| \| \| \|