summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Make RuboCop happyfix-rubocopSean McGivern2017-02-271-1/+1
|
* Merge branch 'sh-async-delete-children' into 'master' Dmitriy Zaporozhets2017-02-271-0/+2
|\ | | | | | | | | Make nested groups deletion synchronous to avoid potential race See merge request !9288
| * Include nested group into destroy_service_specsh-async-delete-childrenDmitriy Zaporozhets2017-02-271-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-273-5/+66
|\ \ | | | | | | | | | | | | fix ERR_CONTENT_LENGTH_MISMATCH on task checkboxes See merge request !8567
| * | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-243-5/+66
| | |
* | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-273-4/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add the username of the current user to the HTTP(S) clone URL Closes #1937 See merge request !9347
| * | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-243-4/+31
| | | |
* | | | Merge branch 'unified-member-api-response' into 'master' Sean McGivern2017-02-271-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | API: Return 400 for all validation erros in the mebers API See merge request !9523
| * | | | API: Return 400 for all validation erros in the mebers APIunified-member-api-responseRobert Schilling2017-02-241-5/+5
| | | | |
* | | | | Merge branch 'feature/runners-v4-api' into 'master' Kamil Trzciński2017-02-271-0/+148
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add Runner registration/deletion API See merge request !9246
| * | | | Rename API::Ci to API::Runnerfeature/runners-v4-apiTomasz Maczukin2017-02-161-1/+1
| | | | |
| * | | | Fix rubocop offensesTomasz Maczukin2017-02-161-8/+8
| | | | |
| * | | | Add Runner registration/deletion APITomasz Maczukin2017-02-161-0/+148
| | | | |
* | | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-30/+94
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Git history follow renames again by performing the --skip in Ruby Closes #23062 See merge request !9314
| * | | | | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-231-73/+63
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-11/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hack is needed because of an issue when --follow and --skip are passed to git log at the same time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-2416-363/+302
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207
| * | | | | | Address reviewDouwe Maan2017-02-242-2/+12
| | | | | | |
| * | | | | | Fix specDouwe Maan2017-02-241-2/+2
| | | | | | |
| * | | | | | Fix specsDouwe Maan2017-02-242-3/+2
| | | | | | |
| * | | | | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-2411-89/+76
| | | | | | |
| * | | | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-245-269/+212
| | | | | | |
* | | | | | | Merge branch 'moving-issue-with-two-list-labels' into 'master' Alfredo Sumaran2017-02-241-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes label from previous list Closes #28484 See merge request !9418
| * | | | | | | Removes label from previous listmoving-issue-with-two-list-labelsPhil Hughes2017-02-211-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+76
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added user-callouts Closes #27269 See merge request !9249
| * | | | | | | Fix failing specsAlfredo Sumaran2017-02-231-5/+9
| | | | | | | |
| * | | | | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-232-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it appends a template instead of relying in a partial to show it.
| * | | | | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-231-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 buttonJose Ivan Vargas2017-02-233-4/+4
| | | | | | | |
| * | | | | | | Changed the javascript class from using the global scope to exporting it via ↵Jose Ivan Vargas2017-02-233-40/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webpack Also improved accesibility and change the id from user_callouts to a class
| * | | | | | | Added CHANGELOG and corrected linter errorsJose Ivan Vargas2017-02-231-1/+1
| | | | | | | |
| * | | | | | | Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-233-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the user_callout haml to a partial and added the corresponding SVG icon
* | | | | | | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-241-16/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI highlight & autocomplete See merge request !8420
| * | | | | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-091-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'refactor-graphs-bundle' into 'master' Filipa Lacerda2017-02-243-27/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor graphs bundle to ES module syntax See merge request !9502
| * | | | | | | | | refactor stat_graph_contributors_graph to es6 module syntaxMike Greiling2017-02-241-5/+3
| | | | | | | | | |
| * | | | | | | | | refactor stat_graph_contributors_util to es6 module syntaxMike Greiling2017-02-241-2/+1
| | | | | | | | | |
| * | | | | | | | | remove unused StatGraph classMike Greiling2017-02-241-20/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'boards-card-template-to-js' into 'master' Filipa Lacerda2017-02-241-0/+168
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards card template in JS See merge request !9477
| * | | | | | | | | | Fixed eslint errorsboards-card-template-to-jsPhil Hughes2017-02-231-3/+7
| | | | | | | | | | |
| * | | | | | | | | | Issue boards card in JSPhil Hughes2017-02-231-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-247-4/+180
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-usersTimothy Andrew2017-02-242-3/+5
| | | | | | | | | | |
| * | | | | | | | | | Don't allow deleting a ghost user.Timothy Andrew2017-02-242-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 @rymaiTimothy Andrew2017-02-242-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | | | | | | Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-241-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Andrew2017-02-242-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | | | | | | | Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Create a `Uniquify` class, which generalizes the process of generating unique strings, by accepting a function that defines what "uniqueness" means in a given context. 2. WIP: Make sure tests for `Namespace` pass, add more if necessary. 3. WIP: Add tests for `Uniquify`
| * | | | | | | | | | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-243-3/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "Associated" issues are issues the user has created + issues that the user is assigned to. - Issues that a user owns are transferred to a "Ghost User" (just a regular user with `state = 'ghost'` that is created when `User.ghost` is called). - Issues that a user is assigned to are moved to the "Unassigned" state. - Fix a spec failure in `profile_spec` — a spec was asserting that when a user is deleted, `User.count` decreases by 1. After this change, deleting a user creates (potentially) a ghost user, causing `User.count` not to change. The spec has been updated to look for the relevant user in the assertion.
* | | | | | | | | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-2459-328/+326
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Namespace#full_path instead of #path where appropriate See merge request !9495
View Lorry Controller Status