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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Minor refactoring of Uploaders	Robert Speicher	2017-02-24	10	-65/+79
\| \| \| \| \| \| \| \| \|	- Moves a duplicate `file_storage?` definition into the common `GitlabUploader` ancestor. - Get the `uploads` base directory from a class method rather than hard-coding it where it's needed. This will be used in a subsequent MR to store Uploads in the database. - Improves the specs for uploaders.
*	Merge branch '28419-ask-confirmation-cancel' into 'master'	Fatih Acet	2017-02-24	1	-1/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Adds confirmation for cancel button Closes #28419 See merge request !9519
\| *	Adds confirmation for cancel button28419-ask-confirmation-cancel	Filipa Lacerda	2017-02-24	1	-1/+16
\| \|
* \|	Merge branch 'moving-issue-with-two-list-labels' into 'master'	Alfredo Sumaran	2017-02-24	4	-5/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes label from previous list Closes #28484 See merge request !9418
\| * \|	Removes label from previous listmoving-issue-with-two-list-labels	Phil Hughes	2017-02-21	4	-5/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When dragging an issue to a list that it already exists in it was previously not removing the label for the list it was moving from. This changes that to make that API call. Closes #28484
* \| \|	Merge branch 'remove-require-context-application-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-11/+170
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from application.js See merge request !9491
\| * \| \|	add missing require statement and don't require selfremove-require-context-application-bundle	Mike Greiling	2017-02-23	1	-1/+1
\| \| \| \|
\| * \| \|	remove require.context from application.js	Mike Greiling	2017-02-23	1	-11/+170
\| \| \| \|
* \| \| \|	Merge branch 'user-callouts' into 'master'	Filipa Lacerda	2017-02-24	10	-0/+185
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added user-callouts Closes #27269 See merge request !9249
\| * \| \| \|	Corrected indentation on the template stringuser-callouts	Jose Ivan Vargas	2017-02-24	1	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removed eslint disabled rules
\| * \| \| \|	Fix failing specs	Alfredo Sumaran	2017-02-23	1	-5/+9
\| \| \| \| \|
\| * \| \| \|	Modified the user_callout behaviour	Jose Ivan Vargas	2017-02-23	7	-45/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it appends a template instead of relying in a partial to show it.
\| * \| \| \|	Removed disabled rules from the user_callout_spec.js	Jose Ivan Vargas	2017-02-23	4	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line
\| * \| \| \|	Moved the dismiss-icon listener to close the callout to a button	Jose Ivan Vargas	2017-02-23	5	-7/+7
\| \| \| \| \|
\| * \| \| \|	Changed the javascript class from using the global scope to exporting it via ↵	Jose Ivan Vargas	2017-02-23	9	-78/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	webpack Also improved accesibility and change the id from user_callouts to a class
\| * \| \| \|	Added CHANGELOG and corrected linter errors	Jose Ivan Vargas	2017-02-23	5	-4/+7
\| \| \| \| \|
\| * \| \| \|	Created unit tests, fixtures and integration tests	Jose Ivan Vargas	2017-02-23	10	-33/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the user_callout haml to a partial and added the corresponding SVG icon
\| * \| \| \|	Initial version of the user-callouts	Jose Ivan Vargas	2017-02-23	5	-2/+83
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-require-context-profile-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-3/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from profile_bundle See merge request !9492
\| * \| \| \| \|	remove require.context from profile_bundleremove-require-context-profile-bundle	Mike Greiling	2017-02-23	1	-3/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-require-context-protected-branches-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-3/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from protected_branches_bundle See merge request !9493
\| * \| \| \| \| \|	remove require.context from protected_branches_bundleremove-require-context-protected-branches-bundle	Mike Greiling	2017-02-23	1	-3/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-require-context-snippet-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-4/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from snippet_bundle See merge request !9494
\| * \| \| \| \| \|	remove require.context from snippet_bundleremove-require-context-snippet-bundle	Mike Greiling	2017-02-23	1	-4/+0
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-require-context-users-bundle' into 'master'	Alfredo Sumaran	2017-02-24	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from users_bundle See merge request !9496
\| * \| \| \| \| \|	remove require.context from users_bundleremove-require-context-users-bundle	Mike Greiling	2017-02-23	1	-3/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-jquery-ui-plugins' into 'master'	Jacob Schatz	2017-02-24	13	-63/+76
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI highlight & autocomplete See merge request !8420
\| * \| \| \| \|	Removed jQuery UI highlight & autocompleteremove-jquery-ui-plugins	Phil Hughes	2017-02-09	13	-63/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* \| \| \| \| \|	Merge branch '28366-renamed-file-tooltip-contains-html' into 'master'	Filipa Lacerda	2017-02-24	2	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Renamed file tooltip contains html" Closes #28366 See merge request !9374
\| * \| \| \| \| \|	Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-html	Sam Rose	2017-02-20	2	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'refactor-graphs-bundle' into 'master'	Filipa Lacerda	2017-02-24	8	-558/+507
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor graphs bundle to ES module syntax See merge request !9502
\| * \| \| \| \| \| \|	refactor stat_graph_contributors to es6 module syntaxrefactor-graphs-bundle	Mike Greiling	2017-02-24	2	-102/+100
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor stat_graph_contributors_graph to es6 module syntax	Mike Greiling	2017-02-24	4	-282/+274
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor stat_graph_contributors_util to es6 module syntax	Mike Greiling	2017-02-24	4	-137/+135
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	remove unused StatGraph class	Mike Greiling	2017-02-24	3	-39/+0
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'boards-card-template-to-js' into 'master'	Filipa Lacerda	2017-02-24	6	-74/+239
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards card template in JS See merge request !9477
\| * \| \| \| \| \| \|	Fixed eslint errorsboards-card-template-to-js	Phil Hughes	2017-02-23	2	-11/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Issue boards card in JS	Phil Hughes	2017-02-23	6	-74/+235
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the issue boards card template into the JS. This helps to improve the code coverage & will eventually make it easier to move this to .vue files
* \| \| \| \| \| \| \|	Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master'	Jacob Schatz	2017-02-24	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes line number copy issue for unfolded parallel view diff Closes #28367 See merge request !9365
\| * \| \| \| \| \| \| \|	fixes line number copy issue for unfolded parallel view diff28367-fix-unfold-diff-line-number-copy-paste	Nur Rony	2017-02-20	2	-2/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '27847-auth0-doc-typo' into 'master'	Achilleas Pipinellis	2017-02-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in auth0.md doc Closes #27847 See merge request !9059
\| * \| \| \| \| \| \| \| \|	Fix typo in auth0.md doc 27847-auth0-doc-typo	Reb	2017-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed spurious character from Omnibus example
* \| \| \| \| \| \| \| \| \|	Merge branch '12726-preserve-issues-after-deleting-users' into 'master'	Douwe Maan	2017-02-24	18	-18/+320
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deleting a user shouldn't delete associated issues. Closes #12726 See merge request !7393
\| * \| \| \| \| \| \| \| \| \|	Fix specs for the ghost user feature.12726-preserve-issues-after-deleting-users	Timothy Andrew	2017-02-24	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't allow deleting a ghost user.	Timothy Andrew	2017-02-24	8	-5/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add a `destroy_user` ability. This didn't exist before, and was implicit in other abilities (only admins could access the admin area, so only they could destroy all users; a user can only access their own account page, and so can destroy only themselves). - Grant this ability to admins, and when the current user is trying to destroy themselves. Disallow destroying ghost users in all cases. - Modify the `Users::DestroyService` to check this ability. Also check it in views to decide whether or not to show the "Delete User" button. - Add a short summary of the Ghost User to the bio.
\| * \| \| \| \| \| \| \| \| \|	Implement final review comments from @DouweM and @rymai	Timothy Andrew	2017-02-24	6	-61/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Have `Uniquify` take a block instead of a Proc/function. This is more idiomatic than passing around a function in Ruby. - Block a user before moving their issues to the ghost user. This avoids a data race where an issue is created after the issues are migrated to the ghost user, and before the destroy takes place. - No need to migrate issues (to the ghost user) in a transaction, because we're using `update_all` - Other minor changes
\| * \| \| \| \| \| \| \| \| \|	Remove the default value for the `users.ghost` database column.	Timothy Andrew	2017-02-24	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The default (false) is not strictly required, and this lets us avoid a potentially expensive migration
\| * \| \| \| \| \| \| \| \| \|	Implement review comments from @rymai and @yorickpeterse	Timothy Andrew	2017-02-24	4	-81/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Refactoring and specs in the `Uniquify` class. 2. Don't use the `AdvisoryLocking` class. Similar functionality is provided (backed by Redis) in the `ExclusiveLease` class.
\| * \| \| \| \| \| \| \| \| \|	Use a `ghost` boolean to track ghost users.	Timothy Andrew	2017-02-24	6	-6/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than using a separate `ghost` state. This lets us have the benefits of both ghost and blocked users (ghost: true, state: blocked) without having to rewrite a number of queries to include cases for `state: ghost`.
\| * \| \| \| \| \| \| \| \| \|	Implement review comments from @DouweM and @nick.thomas.	Timothy Andrew	2017-02-24	3	-2/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Use an advisory lock to guarantee the absence of concurrency in `User.ghost`, to prevent data races from creating more than one ghost, or preventing the creation of ghost users by causing validation errors. 2. Use `update_all` instead of updating issues one-by-one.