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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add 409 conflict testsfix-ci-requests-concurrency	Kamil Trzcinski	2017-01-25	1	-0/+14
\|
*	Add CHANGELOG	Kamil Trzcinski	2017-01-25	1	-0/+3
\|
*	Fix specs	Kamil Trzcinski	2017-01-25	2	-1/+2
\|
*	Fix picking CI builds	Kamil Trzcinski	2017-01-25	2	-11/+17
\| \| \| \| \|	The conflict happens when we try to update a build, but fail to do so due to fact that we update the same build concurrently for two different runners.
*	Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutes	Kamil Trzcinski	2017-01-25	4	-73/+11
\|
*	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzcinski	2017-01-24	345	-1408/+3304
\|\ \| \| \| \| \| \|	backport-ee-changes-for-build-minutes
\| *	Merge branch '24923_nested_tasks' into 'master'	Sean McGivern	2017-01-24	5	-5/+89
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix nested tasks in ordered list Closes #24923 See merge request !8626
\| \| *	fix nested tasks in ordered list	Jarka Kadlecova	2017-01-24	5	-5/+89
\| \| \|
\| * \|	Merge branch 'patch-12' into 'master'	Rémy Coutable	2017-01-24	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in link to "Services Templates" page. See merge request !8709
\| \| * \|	Fix typo in link to "Services Templates" page.	Arnd	2017-01-23	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'docs/conflict-editor' into 'master'	Achilleas Pipinellis	2017-01-24	2	-0/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for resolve conflicts editor See merge request !8748
\| \| * \| \|	Add docs for resolve conflicts editor	Achilleas Pipinellis	2017-01-24	2	-0/+12
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Merge branch 'docs/2fa-cleanup' into 'master'	Achilleas Pipinellis	2017-01-24	11	-215/+224
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge the two 2FA docs into one See merge request !8747
\| \| * \| \|	Merge the two 2FA docs into one	Achilleas Pipinellis	2017-01-24	11	-215/+224
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Merge branch 'docs/issues-due-dates' into 'master'	Achilleas Pipinellis	2017-01-24	9	-0/+38
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add due dates docs See merge request !8744
\| \| * \| \|	Add due dates docs	Achilleas Pipinellis	2017-01-24	9	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵	Sean McGivern	2017-01-24	9	-4/+235
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028
\| \| * \| \|	Search feature: redirects to commit page if query is commit sha and only ↵	YarNayar	2017-01-24	5	-1/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit found See !8028 and #24833
\| \| * \| \|	Allows to search within project by commit's hash	YarNayar	2017-01-24	6	-4/+179
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was proposed in #24833
\| * \| \| \|	Merge branch 'zj-mattermost-api-update' into 'master'	Grzegorz Bizon	2017-01-24	3	-8/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small update to the Mattermost API See merge request !8712
\| \| * \| \| \|	Small update to the Mattermost APIzj-mattermost-api-update	Z.J. van de Weg	2017-01-24	3	-8/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes make it possible to wrap multiple API requests in one session.
\| * \| \| \| \|	Merge branch 'grapify-deploy-keys' into 'master'	Rémy Coutable	2017-01-24	2	-16/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify all endpoints of the deploy keys API See merge request !8721
\| \| * \| \| \| \|	Grapify all endpoints of the deploy keys APIgrapify-deploy-keys	Robert Schilling	2017-01-23	2	-16/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'patch-12' into 'master'	James Lopez	2017-01-24	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hash of ruby in update documentation See merge request !8735
\| \| * \| \| \| \| \|	Fix hash of ruby archive in documentation	Maximilien Cuony	2017-01-24	2	-2/+2
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'backport-ee-1051-approvals-reset-on-closed-mr' into 'master'	Sean McGivern	2017-01-24	4	-39/+52
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes on approvals reset for closed MRs See merge request !8559
\| \| * \| \| \| \| \|	Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mr	Oswaldo Ferreira	2017-01-23	4	-39/+52
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'docs/confidential-issues' into 'master'	Achilleas Pipinellis	2017-01-24	9	-14/+87
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for confidential issues Closes #14397 See merge request !8741
\| \| * \| \| \| \| \| \|	Add link to confidential issues MR	Achilleas Pipinellis	2017-01-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Add docs for confidential issues	Achilleas Pipinellis	2017-01-24	9	-14/+86
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Merge branch 'zj-requeue-pending-delete' into 'master'	Yorick Peterse	2017-01-24	2	-0/+53
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requeue projects pending deletion See merge request !8438
\| \| * \| \| \| \| \| \|	Reject projects without namespacezj-requeue-pending-delete	Z.J. van de Weg	2017-01-24	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Quote class name in case it gets destroyed	Zeger-Jan van de Weg	2017-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Requeue projects pending deletion	Z.J. van de Weg	2017-01-24	2	-0/+52
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There have been several bugs in the project deletion service and worker. Resulting in projects stuck in pending delete state, which limits users to create projects with the same name, keeps stale records in the database, and all kinds of other trouble. This post deployment migration requeues all these projects for deletion, in the hope that most of these could be removed by the updated code.
\| * \| \| \| \| \| \|	Merge branch 'disable-automatic-login-on-email-confirmation' into 'master'	Marin Jankovski	2017-01-24	2	-6/+6
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable automatic login feature when clicking on email confirmation links See merge request !7472
\| \| * \| \| \| \| \|	Disable automatic login feature when clicking on email confirmation linksdisable-automatic-login-on-email-confirmation	Brian Neel	2016-12-31	2	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '27066-textarea-border' into 'master'	Fatih Acet	2017-01-23	2	-1/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Comment/Description textarea shows a blue border on the left" Closes #27066 See merge request !8720
\| \| * \| \| \| \| \| \|	Remove hover styling for generic textarea27066-textarea-border	Annabel Dunstone Gray	2017-01-23	2	-1/+4
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-pick-security-fixes' into 'master'	Robert Speicher	2017-01-23	20	-43/+213
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick security fixes from 8.16.1 et al into master Closes #26813, #26249, #26259, #26243, #26242 See merge request !8724
\| \| * \| \| \| \| \| \|	Add a changelog entry for #26242rs-pick-security-fixes	Robert Speicher	2017-01-23	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'upgrade-omniauth' into 'security'	Robert Speicher	2017-01-23	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade OmniAuth Ruby gem to 1.3.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813 See merge request !2056
\| \| * \| \| \| \| \| \|	Merge branch 'fix-guest-access-posting-to-notes' into 'security'	Robert Speicher	2017-01-23	3	-10/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent users from creating notes on resources they can't access See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
\| \| * \| \| \| \| \| \|	Merge branch 'fix-api-mr-permissions' into 'security'	Robert Speicher	2017-01-23	8	-25/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that only privileged users can access merge requests in the API See merge request !2053
\| \| * \| \| \| \| \| \|	Merge branch 'fix/rename-group-export-vuln' into 'security'	Robert Speicher	2017-01-23	3	-2/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix export files not removed when a user takes over a namespace See merge request !2051
\| \| * \| \| \| \| \| \|	Merge branch 'fix-users-deleting-public-deployment-keys' into 'security'	Robert Speicher	2017-01-23	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix users being able to delete instance public deployment keys See merge request !2049
\| * \| \| \| \| \| \| \|	Merge branch 'no-more-bosses' into 'master' 27019-merge-when-pipeline-succeeds-visible-if-approvals-are-pending	Stan Hu	2017-01-23	2	-10/+10
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename endboss -> maintainer, miniboss -> reviewer See merge request !8719
\| \| * \| \| \| \| \| \| \|	Rename endboss -> maintainer, miniboss -> reviewerno-more-bosses	Sean McGivern	2017-01-13	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to describe these roles in a way that is more understandable to people not familiar with GitLab.
\| * \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-01-23	15	-56/+243
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master' Handle unsubscribe notification via email Closes #22619 See merge request !6597
\| \| * \| \| \| \| \| \| \| \|	Handles unsubscribe from notifications via email	Pawel Chojnacki	2017-01-13	15	-56/+243
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header
\| * \| \| \| \| \| \| \| \|	Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master'	Douwe Maan	2017-01-23	3	-2/+15
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow creating protected branches when user can merge to such branch Closes #22638 See merge request !8458