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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keys	Yorick Peterse	2017-02-10	1	-0/+33
\| \| \| \| \| \| \|	This adds a Rubocop rule to enforce the use of add_concurrent_foreign_key instead of the regular add_foreign_key method. This cop has been disabled for existing migrations so we don't need to change those.
*	Add method for creating foreign keys concurrently	Yorick Peterse	2017-02-10	1	-6/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method allows one to create foreign keys without blocking access to the source table, but only on PostgreSQL. When creating a regular foreign key the "ALTER TABLE" statement used for this won't return until all data has been validated. This statement in turn will acquire a lock on the source table. As a result this lock can be held for quite a long amount of time, depending on the number of rows and system load. By breaking up the foreign key creation process in two steps (creation, and validation) we can reduce the amount of locking to a minimum. Locking is still necessary for the "ALTER TABLE" statement that adds the constraint, but this is a fast process and so will only block access for a few milliseconds.
*	Merge branch 'replace-teaspoon-references' into 'master'	Clement Ho	2017-02-10	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011
\| *	Replace teaspoon references with Karmareplace-teaspoon-references	Clement Ho	2017-02-10	1	-1/+1
\| \|
* \|	Merge branch '27963-tooltips-jobs' into 'master'	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140
\| * \|	Fix broken test to use trigger in order to not take tooltip overlaping in ↵	Filipa Lacerda	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	consideration
* \| \|	Merge branch 'rs-warden-blocked-users' into 'master'	Robert Speicher	2017-02-10	3	-54/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't perform Devise trackable updates on blocked User records Closes #27519 See merge request !8915
\| * \| \|	Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users	Robert Speicher	2017-02-10	3	-54/+34
\| \| \|/ \| \|/\|
* \| \|	Merge branch '1051-api-create-users-without-password' into 'master'	Rémy Coutable	2017-02-10	1	-0/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally make users created via the API set their password Closes #1051 See merge request !8957
\| * \| \|	Optionally make users created via the API set their password	Joost Rijneveld	2017-02-09	1	-0/+12
\| \| \| \|
* \| \| \|	Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master'	Kamil Trzciński	2017-02-10	1	-0/+16
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107
\| * \| \|	Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page	Luke "Jared" Bennett	2017-02-10	1	-0/+16
\| \| \| \|
* \| \| \|	Merge branch 'dz-nested-groups-members-page' into 'master'	Dmitriy Zaporozhets	2017-02-10	3	-0/+80
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Nested groups members page See merge request !9062
\| * \| \|	Show parent group members for nested groupdz-nested-groups-members-page	Dmitriy Zaporozhets	2017-02-10	3	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'issue_27855' into 'master'	Rémy Coutable	2017-02-10	1	-5/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135
\| * \| \| \|	Fix admin_labels_spec.rb transient failureissue_27855	Felipe Artur	2017-02-10	1	-5/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'test-for-current-gitlab-ci-yml' into 'master'	Rémy Coutable	2017-02-10	1	-0/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure our current .gitlab-ci.yml is valid See merge request !9125
\| * \| \| \| \|	Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-yml	Lin Jen-Shin	2017-02-10	1	-0/+10
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could prevent errors described in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8970 Everything we're using right now, should be valid of course.
* \| \| \| \|	Merge branch 'rs-issue-27974' into 'master'	Rémy Coutable	2017-02-10	2	-3/+24
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a transient failure from spec/requests/api/groups_spec.rb Closes #27974 See merge request !9116
\| * \| \| \|	Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974	Robert Speicher	2017-02-09	2	-3/+24
\| \| \| \| \|
* \| \| \| \|	Merge branch 'protected-branch-dropdown-titles' into 'master'	Jacob Schatz	2017-02-10	1	-2/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added header to protected branches access dropdowns See merge request !8774
\| * \| \| \|	Added header to protected branches access dropdownsprotected-branch-dropdown-titles	Phil Hughes	2017-01-26	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
* \| \| \| \|	Merge branch 'revert-0ef587b6' into 'master'	Filipa Lacerda	2017-02-09	2	-16/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707
\| * \| \| \| \|	Fix expand_collapse_diffs specsrevert-0ef587b6	Annabel Dunstone Gray	2017-02-09	1	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Use a new class to keep old behavior	Filipa Lacerda	2017-02-08	2	-16/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-gemfetcher-cop-spec' into 'master'	Sean McGivern	2017-02-09	1	-0/+46
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a spec for our custom GemFetcher cop See merge request !9076
\| * \| \| \| \| \|	Add a spec for our custom GemFetcher coprs-gemfetcher-cop-spec	Robert Speicher	2017-02-09	1	-0/+46
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'upgrade-babel-v6' into 'master'	Alfredo Sumaran	2017-02-09	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade from Babel 5 to Babel 6 See merge request !9072
\| * \| \| \| \| \|	fix failing karma test	Mike Greiling	2017-02-09	1	-2/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'	Rémy Coutable	2017-02-09	1	-0/+49
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move 'User Snippets' Spinach feature to Rspec See merge request !8574
\| * \| \| \| \|	Move 'User Snippets' Spinach feature to Rspec	the-undefined	2017-01-16	1	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* \| \| \| \| \|	Correctly transform an anchor link to GFM when copying it	Douwe Maan	2017-02-09	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_26701' into 'master'	Sean McGivern	2017-02-09	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove JIRA closed status icon Closes #26701 See merge request !8944
\| * \| \| \| \|	Remove JIRA closed status iconissue_26701	Felipe Artur	2017-02-08	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-create-nested-groups-via-ui' into 'master'	Dmitriy Zaporozhets	2017-02-09	1	-1/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow creating nested group via UI See merge request !8786
\| * \| \| \| \| \|	Allow creating nested group via UIdz-create-nested-groups-via-ui	Dmitriy Zaporozhets	2017-02-07	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'dz-nested-groups-api' into 'master'	Dmitriy Zaporozhets	2017-02-09	1	-0/+14
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nested groups API See merge request !9034
\| * \| \| \| \| \|	Add nested groups to the APIdz-nested-groups-api	Dmitriy Zaporozhets	2017-02-08	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'dm-add-column-with-default-cop' into 'master'	Douwe Maan	2017-02-09	1	-0/+41
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop that checks if add_column_with_default is used with up/down methods See merge request !9077
\| * \| \| \| \| \| \|	Add cop that checks if add_column_with_default is used with up/down methods	Douwe Maan	2017-02-08	1	-0/+41
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-jquery-ui-datepicker' into 'master'	Jacob Schatz	2017-02-08	4	-17/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI datepicker See merge request !8421
\| * \| \| \| \| \| \| \|	Changed date check testremove-jquery-ui-datepicker	Phil Hughes	2017-02-06	1	-19/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed missing edit link click	Phil Hughes	2017-02-06	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed some specs	Phil Hughes	2017-02-06	4	-31/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG item
* \| \| \| \| \| \| \| \|	Merge branch 'remove-jquery-ui-sortable' into 'master'	Jacob Schatz	2017-02-08	4	-17/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI sortable See merge request !8478
\| * \| \| \| \| \| \| \| \|	Removed jQuery UI sortableremove-jquery-ui-sortable	Phil Hughes	2017-02-06	4	-17/+32
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'dz-fix-route-rename-descendants' into 'master'	Dmitriy Zaporozhets	2017-02-08	1	-6/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix route rename descendants if route.name is blank See merge request !9074
\| * \| \| \| \| \| \| \|	Fix route rename descendants if route.name is blank	Dmitriy Zaporozhets	2017-02-08	1	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'bypass-whitelist-for-external-user' into 'master'	Robert Speicher	2017-02-08	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bypass signup domain validation for external users Closes #25279 See merge request !8575
\| * \| \| \| \| \| \| \|	Bypass signup domain validation for external users	Reza Mohammadi	2017-02-08	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #25279