summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-1621-40/+325
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix tests and disallow 0 to make it consistent with .gitlab-ci.ymlLin Jen-Shin2017-02-151-0/+6
| | * | | | | | | | Add a few more tests and make sure empty value sets to nilLin Jen-Shin2017-02-152-2/+31
| | * | | | | | | | Use the same syntax for default expirationLin Jen-Shin2017-02-151-3/+3
| | * | | | | | | | Test build API if expire_in not set, set to app defaultLin Jen-Shin2017-02-151-2/+17
| | * | | | | | | | ApplicationSetting.current doesn't work well in testsLin Jen-Shin2017-02-151-0/+2
| | * | | | | | | | Initial implementation for default artifacts expirationLin Jen-Shin2017-02-151-1/+1
| * | | | | | | | | Merge branch '27530-fix-job-dropdown-pipeline-console-error' into 'master' Fatih Acet2017-02-241-0/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Prevent propagation of click even in job name inside dropdown.27530-fix-job-dropdown-pipeline-console-errorFilipa Lacerda2017-02-231-0/+12
* | | | | | | | | | Backport groups API to V3Robert Schilling2017-02-241-0/+35
* | | | | | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-241-12/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'create_branch_repo_less' into 'master' Robert Speicher2017-02-232-1/+48
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fixes after reviewcreate_branch_repo_lessValery Sizov2017-02-232-8/+12
| * | | | | | | | Create master branch first if project is repository-lessValery Sizov2017-02-231-1/+44
* | | | | | | | | Merge branch 'enable-rspec-be_eql-cop' into 'master' Robert Speicher2017-02-233-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable the RSpec/BeEql copenable-rspec-be_eql-copRémy Coutable2017-02-233-7/+7
* | | | | | | | | | Merge branch 'fix-git-access-specs' into 'master' Rémy Coutable2017-02-231-5/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix GitAccess specsfix-git-access-specsSean McGivern2017-02-231-5/+14
* | | | | | | | | | | Merge branch 'master' into 'master' Clement Ho2017-02-232-0/+60
|\ \ \ \ \ \ \ \ \ \ \