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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Grapify the CI::Runners APIgrapify-ci-runners-api	Robert Schilling	2017-02-22	1	-26/+18
\|
*	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
\| * \| \| \| \| \| \| \|	changed changelog text to be normal case28389-ux-problem-with-pipeline-coverage-placeholder	dimitrieh	2017-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed coverage reg expression placeholder text to be more like a placeholder	dimitrieh	2017-02-21	2	-1/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'hash-concurrent-foreign-key-names' into 'master'	Rémy Coutable	2017-02-21	2	-1/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hash concurrent foreign key names similar to Rails See merge request !9415
\| * \| \| \| \| \| \| \|	Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-names	Yorick Peterse	2017-02-21	2	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was initially not implemented simply because I forgot about the size limit of constraint names in PostgreSQL (63 bytes). Using the old technique we can't add foreign keys for certain tables. For example, adding a foreign key on protected_branch_merge_access_levels.protected_branch_id would lead to the following key name: fk_protected_branch_merge_access_levels_protected_branches_protected_branch_id This key is 78 bytes long, thus violating the PostgreSQL size requirements. The hashing strategy is copied from Rails' foreign_key_name() method, which unfortunately is private and subject to change without notice.
* \| \| \| \| \| \| \| \|	Merge branch '26879-fix-preselected-namespace-when-creating-project' into ↵	Rémy Coutable	2017-02-21	3	-1/+50
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix preselected namespace when creating a project Closes #26879 See merge request !9389
\| * \| \| \| \| \| \| \| \|	Fix preselected namespace when creating a project	David Piegza	2017-02-21	3	-1/+50
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-todos-restful' into 'master'	Sean McGivern	2017-02-21	8	-26/+130
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use POST methods to mark Todos as done Closes #28467 See merge request !9410
\| * \| \| \| \| \| \| \| \| \|	Backport Todos API to V3api-todos-restful	Robert Schilling	2017-02-21	3	-0/+102
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	API: Use POST requests to mark todos as done	Robert Schilling	2017-02-21	5	-26/+28
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'mr-origin-8390' into 'master'	Rémy Coutable	2017-02-21	1	-6/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update using_docker_images.md See merge request !9417
\| * \| \| \| \| \| \| \| \| \|	Update using_docker_images.md	Adam Boseley	2017-02-21	1	-6/+9
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'group-memebrs-owner-level' into 'master'	Sean McGivern	2017-02-21	3	-1/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to change user permissions in group to owner Closes #28233 See merge request !9299
\| * \| \| \| \| \| \| \| \| \|	Added ability to change user permissions in group to ownergroup-memebrs-owner-level	Phil Hughes	2017-02-16	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #28233
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'snippets-search' into 'master'	Sean McGivern	2017-02-21	2	-31/+28
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of snippet search results Closes #26832 See merge request !9228
\| * \| \| \| \| \| \| \| \| \|	Fixed alignment of snippet search resultssnippets-search	Phil Hughes	2017-02-14	2	-31/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also enabled syntaax highlight on the search results Closes #26832
* \| \| \| \| \| \| \| \| \| \|	Merge branch '28186-long-group-names-overflow-out-of-todos-view' into 'master'	Filipa Lacerda	2017-02-21	3	-13/+52
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate long title text on Todo items Closes #28186 See merge request !9311
\| * \| \| \| \| \| \| \| \| \| \|	Truncate long title text on Todo items28186-long-group-names-overflow-out-of-todos-view	Sam Rose	2017-02-20	3	-13/+52
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2017-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab CE/EE comparison & subscribe links in README.md See merge request !9404
\| * \| \| \| \| \| \| \| \| \| \|	Update GitLab CE/EE comparison & subscribe links in README.md	Peter Dave Hello	2017-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dropdown-loading-class-add' into 'master'	Filipa Lacerda	2017-02-21	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes when loading indicator is added to dropdown See merge request !9345
\| * \| \| \| \| \| \| \| \| \| \|	Fixed eslint errordropdown-loading-class-add	Phil Hughes	2017-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fixed ref switcher tests	Phil Hughes	2017-02-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|