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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 8.18.0-prev8.18.0.pre	Felipe Artur	2017-02-22	1	-1/+1
\|
*	Update CHANGELOG.md for 8.17.0	Felipe Artur	2017-02-22	163	-653/+180
\| \| \|	[ci skip]
*	Merge branch 'lnovy/gitlab-ce-empty-variables' into 'master'	Rémy Coutable	2017-02-22	3	-3/+31
\|\ \| \| \| \| \| \| \| \|	UI: Allow a project variable to be set to an empty value See merge request !9414
\| *	Fix specslnovy/gitlab-ce-empty-variables	Rémy Coutable	2017-02-21	1	-17/+11
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	UI: Allow a project variable to be set to an empty value	Lukáš Nový	2017-02-21	3	-8/+42
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'grapify-ci-triggers-api' into 'master'	Rémy Coutable	2017-02-22	2	-28/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Grapfiy the CI::Triggers API See merge request !9439
\| * \|	Grapfiy the CI::Triggers APIgrapify-ci-triggers-api	Robert Schilling	2017-02-22	2	-28/+18
\| \| \|
* \| \|	Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'	Rémy Coutable	2017-02-22	5	-2/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add AsciiDoc snippet for CI/CD Badges Closes #26087 See merge request !9164
\| * \| \|	Add AsciiDoc snippet for CI/CD Badges	Jan Christophersen	2017-02-20	5	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* \| \| \|	Merge branch 'dev-docs-ci_docker_build-example_variable_use' into 'master'	Rémy Coutable	2017-02-22	1	-0/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs(ci/docker_build): Add example of variable use See merge request !9159
\| * \| \| \|	docs(ci/docker_build): Add example of variable use	Dmitriy Volkov	2017-02-21	1	-0/+24
\| \| \| \| \|
* \| \| \| \|	Merge branch '22132-rename-branch-name-params-to-branch' into 'master'	Rémy Coutable	2017-02-22	17	-53/+1255
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
\| * \| \| \| \|	Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branch	Oswaldo Ferreira	2017-02-21	17	-53/+1255
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'api-subscription-restful' into 'master'	Sean McGivern	2017-02-22	12	-49/+190
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Make subscription API more RESTfuL Closes #28327 See merge request !9325
\| * \| \| \| \| \|	Update documentationapi-subscription-restful	Robert Schilling	2017-02-22	4	-14/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	API: Make subscription API more RESTfuL	Robert Schilling	2017-02-21	9	-36/+177
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_28051_2' into 'master'	Sean McGivern	2017-02-22	3	-18/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create compare object with default branch when target branch is missing Closes #28051 See merge request !9263
\| * \| \| \| \| \| \|	Create compare object with default branch when target branch is missingissue_28051_2	Felipe Artur	2017-02-21	3	-18/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'	Sean McGivern	2017-02-22	35	-247/+935
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248
\| * \| \| \| \| \| \| \|	Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit	Oswaldo Ferreira	2017-02-21	35	-247/+935
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28462-fix-delimiter-removes-issue-in-todo-counter' into 'master'	Sean McGivern	2017-02-22	3	-3/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes delimiter removes when todo marked as done Closes #28462 See merge request !9435
\| * \| \| \| \| \| \| \|	fix rspec issue after delimiter fix	Nur Rony	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixes delimiter removes when todo marked as done	Nur Rony	2017-02-22	2	-2/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '27287-label-dropdown-error-messages' into 'master'	Sean McGivern	2017-02-22	3	-32/+43
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix form response errors not shown for create label dropdown. See merge request !9058
\| * \| \| \| \| \| \| \|	fix new label errors not visible in dropdown for #27287, also humanize error ↵	Tom Koole	2017-02-09	3	-32/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	key, improve testing hieararchy for reuse, remove duplicate test
* \| \| \| \| \| \| \| \|	Merge branch 'add-filtered-search-to-mr' into 'master'	Alfredo Sumaran	2017-02-22	21	-345/+282
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filtered search to MR page Closes #27131 See merge request !9284
\| * \| \| \| \| \| \| \| \|	Add filtered search to MR pageadd-filtered-search-to-mr	Clement Ho	2017-02-21	21	-345/+282
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-no-more-andor' into 'master'	Robert Speicher	2017-02-22	22	-35/+31
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No more and/or See merge request !9428
\| * \| \| \| \| \| \| \| \| \|	No more and/or	Douwe Maan	2017-02-21	22	-35/+31
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '26881-backup-fails-if-data-changes' into 'master'	Douwe Maan	2017-02-21	3	-1/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728
\| * \| \| \| \| \| \| \| \| \| \|	# This is a combination of 2 commits.	Drew Blessing	2017-02-21	3	-1/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# This is the 1st commit message: Add `copy` backup strategy to combat file changed errors The backup Rake task used to stream data directly from the live data directory into the backup. Under many circumstances this worked OK. However, really active instances would experience a 'file changed as we read it' error - especially with data like the registry. This now copies the data first, then compresses it. It will take a bit more disk space while the backup is in progress, but it's a necessary thing. # The commit message #2 will be skipped: # Add env var
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '26703-todos-count' into 'master'	Clement Ho	2017-02-21	11	-5/+58
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#26703 change todos counter position & format ( for large counts ) Closes #26703 See merge request !9171
\| * \| \| \| \| \| \| \| \| \| \|	change todos counter position & format ( for large counts )	mhasbini	2017-02-21	11	-5/+58
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '1363-redo-mailroom-support' into 'master'	Douwe Maan	2017-02-21	8	-11/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redo internals of Incoming Mail Support See merge request !9385
\| * \| \| \| \| \| \| \| \| \|	Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-support	Gabriel Mazetto	2017-02-21	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Changelog	Gabriel Mazetto	2017-02-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use newer mail_room to get `require_relative` support	Gabriel Mazetto	2017-02-20	6	-9/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'commit-search-ui-fix' into 'master'	Annabel Dunstone Gray	2017-02-21	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the commit search UI Closes gitlab-ee#1765 See merge request !9411
\| * \| \| \| \| \| \| \| \| \|	Fix the commit search UIcommit-search-ui-fix	Phil Hughes	2017-02-21	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1765
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-upgrade-rails' into 'master'	Robert Speicher	2017-02-21	2	-46/+43
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Rails to 4.2.8 See merge request !9419
\| * \| \| \| \| \| \| \| \| \| \|	Upgrade Rails to 4.2.8	Z.J. van de Weg	2017-02-21	2	-46/+43
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master'	Filipa Lacerda	2017-02-21	7	-13/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename retry failed button on pipeline page to just retry See merge request !9369
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2017-02-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken testrename-retry-failed-pipeline-to-retry	Filipa Lacerda	2017-02-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix more tests	dimitrieh	2017-02-21	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fixed specs + docs	dimitrieh	2017-02-20	5	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rename retry failed button on pipeline page to just retry	dimitrieh	2017-02-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-delete-user-permission-check' into 'master'	Stan Hu	2017-02-21	4	-5/+36
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user deletion permission check in `Users::DestroyService` See merge request !8974
\| * \| \| \| \| \| \| \| \| \| \| \|	Add user deletion permission check in `Users::DestroyService`sh-delete-user-permission-check	Stan Hu	2017-02-20	4	-5/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We saw from a recent incident that the `Users::DestroyService` would attempt to delete a user over and over. Revoking the permissions from the current user did not help. We should ensure that the current user does, in fact, have permissions to delete the user. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '28389-ux-problem-with-pipeline-coverage-placeholder' into ↵	Annabel Dunstone Gray	2017-02-21	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Changed coverage reg expression placeholder text to be more like a placeholder Closes #28389 See merge request !9407