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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix broken test28247-timeloops-bug	Filipa Lacerda	2017-02-16	1	-2/+2
\|
*	Transforms startTimeAgoLoops into a static method so we can reuse it instead ↵	Filipa Lacerda	2017-02-16	3	-9/+5
\| \| \| \| \| \|	of have 2 Fix broken test
*	Only run timeago loops after rendering timeago components	Filipa Lacerda	2017-02-16	5	-43/+34
\|
*	Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master'	Rémy Coutable	2017-02-16	5	-18/+50
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Show merge errors in merge request widget Closes #28124 and gitlab-ee#1652 See merge request !9229
\| *	Show merge errors in merge request widget	Sean McGivern	2017-02-16	5	-18/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There were two problems here: 1. On the JS side, the reference to $widgetBody didn't refer to the right DOM element any more. This might be because it was replaced by the `getMergeStatus` method. Even if it wasn't, ensuring we have the right element means that the content gets updated. 2. On the Ruby side, the `log_merge_error` method didn't update the `merge_error` column of the merge request. Change that to update if requested, and update in the most common cases by default. Additionally, this would sometimes return an error hash, but it doesn't look like this was ever used (the return value of `MergeService#execute` appears to be unused everywhere).
* \|	Merge branch 'add-auto-submited-header' into 'master'	Sean McGivern	2017-02-16	4	-0/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163
\| * \|	Set `Auto-Submitted: auto-generated` header to emails	Semyon Pupkov	2017-02-15	4	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* \| \|	Merge branch 'docs/ci-clarify-stop-action' into 'master'	Achilleas Pipinellis	2017-02-16	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that stage is needed to stop environments Closes #28110 See merge request !9296
\| * \| \|	Clarify that stage is needed to stop environments	Achilleas Pipinellis	2017-02-16	2	-1/+6
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'docs/broken-link-uni' into 'master'	Achilleas Pipinellis	2017-02-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in university docs See merge request !9295
\| * \| \|	Fix broken link in university docs	Achilleas Pipinellis	2017-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'beautiful-karma-output' into 'master'	Alfredo Sumaran	2017-02-16	4	-94/+107
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Karma output look nicer for CI See merge request !9165
\| * \| \| \|	Make Karma output look nicer for CI (!9165)	winniehell	2017-02-15	4	-94/+107
\| \| \| \| \|
* \| \| \| \|	Merge branch 'pedro-issue-terminology' into 'master'	Allison Whilden	2017-02-15	5	-36/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up terms used for issues. Use New instead of Add. See merge request !9281
\| * \| \| \| \|	Clean up terms used for issues. Use New instead of Add.pedro-issue-terminology	Pedro Moreira da Silva	2017-02-15	5	-36/+22
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '27959-style-note-links' into 'master'	Alfredo Sumaran	2017-02-15	3	-11/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	style links on system notes to look clickable Closes #27959 See merge request !9251
\| * \| \| \|	allow clicking on text or icon to trigger expand	Simon Knox	2017-02-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	style links on system notes to look clickable	Simon Knox	2017-02-15	3	-10/+3
\|/ / / /
* \| \| \|	Merge branch 'docs/broken-links' into 'master'	Achilleas Pipinellis	2017-02-15	43	-114/+169
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix most of broken docs links See merge request !9275
\| * \| \| \|	Fix most of broken docs links	Achilleas Pipinellis	2017-02-15	43	-114/+169
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'markdown-slash-commands-text' into 'master'	Annabel Dunstone Gray	2017-02-15	2	-3/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change wording of MR comment box See merge request !9193
\| * \| \| \| \|	Change wording of MR comment boxmarkdown-slash-commands-text	Annabel Dunstone Gray	2017-02-13	2	-3/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'move_tags_service_to_namespace' into 'master'	Rémy Coutable	2017-02-15	9	-78/+86
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move tag services to `Tags` namespace See merge request !9231
\| * \| \| \| \| \|	Move tag services to `Tags` namespace	dixpac	2017-02-14	9	-78/+86
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CreateTagService and DeleteTagService where in root namespace, by following service code organization I moved them in Tags::CreateService and Tags::DestroyService
* \| \| \| \| \|	Merge branch 'fix-rubocop-master' into 'master'	Alfredo Sumaran	2017-02-15	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop offense See merge request !9274
\| * \| \| \| \| \|	Fix Rubocop offense	Alfredo Sumaran	2017-02-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '27922-cmd-click-todo-doesn-t-work' into 'master'	Alfredo Sumaran	2017-02-15	5	-18/+112
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regression where cmd-click stopped working for todos and merge request tabs Closes #27922 See merge request !9115
\| * \| \| \| \| \|	Fix regression where cmd-click stopped working for todos and merge request tabs27922-cmd-click-todo-doesn-t-work	Clement Ho	2017-02-15	5	-18/+112
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'alphabetically_sort_tags_on_runner_list' into 'master'	Rémy Coutable	2017-02-15	5	-4/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve 'Alphabetically sort tags on runner list' Closes #27409 See merge request !8922
\| * \| \| \| \| \| \|	Alphabetically sort tags on runner list	blackst0ne	2017-02-15	5	-4/+8
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-remove-deprecated-ci-service' into 'master'	Douwe Maan	2017-02-15	5	-11/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated CI service Closes #28094 See merge request !9221
\| * \ \ \ \ \ \	Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-service	Douwe Maan	2017-02-15	199	-2781/+6720
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \|	Remove deprecated CI service	Z.J. van de Weg	2017-02-14	5	-10/+21
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '26651-cannot-move-project-into-group' into 'master' 27950-ci-status-check	Rémy Coutable	2017-02-15	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify that only project owners can transfer a project Closes #26651 See merge request !9262
\| * \| \| \| \| \| \| \| \|	Specify that only project owners can transfer a project	Mark Fletcher	2017-02-15	2	-1/+5
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \| \| \| \| \|	Merge branch 'add-missing-api-entities' into 'master'	Rémy Coutable	2017-02-15	6	-26/+74
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing api entities Closes #23895 See merge request !7138
\| * \| \| \| \| \| \| \| \|	entities: use the RepoCommit entity for branch commits	Ben Boeckel	2017-02-14	6	-26/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #23895.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-production-assets' into 'master'	Alfredo Sumaran	2017-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only load istanbul plugin in development mode See merge request !9261
\| * \| \| \| \| \| \| \| \| \|	only load istanbul plugin in development mode	Mike Greiling	2017-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'no-more-moment' into 'master'	Alfredo Sumaran	2017-02-15	5	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop Pikaday using moment See merge request !9244
\| * \| \| \| \| \| \| \| \| \| \|	Stop Pikaday using momentno-more-moment	Phil Hughes	2017-02-14	5	-5/+10
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/notification-settings-when-no-repository' into 'master'	Douwe Maan	2017-02-15	3	-4/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show notifications settings even when repository feature is disabled See merge request !9180
\| * \| \| \| \| \| \| \| \| \| \|	Add Changelog entry for notifications buttons fixfix/gb/notification-settings-when-no-repository	Grzegorz Bizon	2017-02-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Improve home panel partial code and view specs	Grzegorz Bizon	2017-02-13	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Show notifications settings when repository is disabled	Grzegorz Bizon	2017-02-13	2	-1/+41
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Remove changelog entries for 8.16.5 release	Robert Speicher	2017-02-15	4	-16/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-github-import-MR-wrong-project' into 'security'	Robert Speicher	2017-02-15	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'svg-xss-fix' into 'security'	Robert Speicher	2017-02-15	5	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-rdoc-xss' into 'security'	Robert Speicher	2017-02-15	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'asciidoctor-xss-patch' into 'security'	Robert Speicher	2017-02-15	3	-0/+30
\| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057