summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-30/+94
|\
| * 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
| * Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-11/+85
* | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-2416-363/+302
|\ \
| * | 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 listmoving-issue-with-two-list-labelsPhil Hughes2017-02-211-0/+21
* | | | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+76
|\ \ \ \
| * | | | Fix failing specsAlfredo Sumaran2017-02-231-5/+9
| * | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-232-17/+6
| * | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-231-6/+3
| * | | | 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
| * | | | 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
* | | | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-241-16/+17
|\ \ \ \ \
| * | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-091-16/+17
* | | | | | Merge branch 'refactor-graphs-bundle' into 'master' Filipa Lacerda2017-02-243-27/+4
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Fixed eslint errorsboards-card-template-to-jsPhil Hughes2017-02-231-3/+7
| * | | | | | | Issue boards card in JSPhil Hughes2017-02-231-0/+164
* | | | | | | | Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-247-4/+180
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-242-15/+12
| * | | | | | | Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-241-0/+40
| * | | | | | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-242-0/+18
| * | | | | | | Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-241-2/+2
| * | | | | | | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-243-3/+84
* | | | | | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-2459-328/+326
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix specDouwe Maan2017-02-242-4/+3
| * | | | | | | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-2358-327/+326
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-248-8/+125
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-243-4/+31
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-233-4/+31
| | |/ / / / / /
| * | | | | | | Merge branch '27762-add-default-artifacts-expiration' into 'master' Kamil Trzciński2017-02-244-4/+82
| |\ \ \ \ \ \ \
| | * | | | | | | Test against default to '0', it should not setLin Jen-Shin2017-02-241-8/+22
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-24192-1076/+3789
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Fix tests due to error key changedLin Jen-Shin2017-02-211-1/+1
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-218-45/+206
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-21146-1059/+3002
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 0 for unlimited, disallow blank, feedback:Lin Jen-Shin2017-02-162-12/+20
| | * | | | | | | | | Use static error message and don't give booleansLin Jen-Shin2017-02-161-0/+4
View Lorry Controller Status