summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' Robert Speicher2016-10-061-4/+12
|\
| * Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-apiRémy Coutable2016-10-051-4/+12
* | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'Rémy Coutable2016-10-062-8/+269
|\ \
| * | multi-file commitMarc Siegfriedt2016-10-052-8/+269
* | | Merge branch 'issue-board-api-support' into 'master' Dmitriy Zaporozhets2016-10-061-0/+192
|\ \ \
| * | | Added Issue Board API supportAndre Guedes2016-10-051-0/+192
* | | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-0/+34
* | | | Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-065-3/+47
|\ \ \ \
| * | | | Add specs for new async ci pipeline workersGrzegorz Bizon2016-10-042-0/+44
| * | | | Fix hipchat service specs after changes in pipelineGrzegorz Bizon2016-10-041-1/+1
| * | | | Fix pipeline fixtures and calls to removed methodGrzegorz Bizon2016-10-042-2/+2
* | | | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-062-0/+159
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-302-0/+159
| |\ \ \ \ \
| | * | | | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-272-0/+159
* | | | | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-0610-13/+114
|\ \ \ \ \ \ \
| * | | | | | | fix export project file permissions issueJames Lopez2016-09-302-0/+6
| * | | | | | | Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' Robert Speicher2016-09-281-0/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Escape HTML nodes in builds commands in ci linterGrzegorz Bizon2016-09-261-0/+35
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-281-6/+33
| |\ \ \ \ \ \ \
| | * | | | | | | API: disable rails session auth for non-GET/HEAD requestsNick Thomas2016-09-231-6/+33
| * | | | | | | | Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-276-7/+29
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-056-13/+414
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-054-23/+49
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0514-91/+378
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0413-58/+270
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-10-0420-55/+225
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tests updatePhil Hughes2016-10-031-6/+13
| * | | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-03292-2303/+10233
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated testsPhil Hughes2016-09-022-2/+4
| * | | | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-0287-510/+2154
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-08-30551-7961/+22936
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated wording in the specsPhil Hughes2016-07-212-6/+6
| * | | | | | | | | | | | | | Fixed failing issuable filter specsPhil Hughes2016-07-201-2/+2
| * | | | | | | | | | | | | | Uses the selected values from the controller not the paramsPhil Hughes2016-07-202-88/+283
| * | | | | | | | | | | | | | Fixed Rubocop errorsPhil Hughes2016-07-201-30/+55
| * | | | | | | | | | | | | | Added spec tests for merge request form including from forked projectPhil Hughes2016-07-201-0/+87
| * | | | | | | | | | | | | | Added tests for new/edit issue formPhil Hughes2016-07-201-0/+85
| * | | | | | | | | | | | | | Revert "Merge branch 'revert-bdb6f1e6' into 'master'"Phil Hughes2016-07-202-4/+3
* | | | | | | | | | | | | | | Merge branch 'fix_group_links_404' into 'master' Fatih Acet2016-10-052-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix group links 404barthc2016-10-052-1/+46
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable2016-10-051-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Imrove grammarKatarzyna Kobierska2016-10-031-1/+1
| * | | | | | | | | | | | | Fix test, add author attribute to all testsKatarzyna Kobierska2016-10-031-0/+9
* | | | | | | | | | | | | | Merge branch 'trending-caching' into 'master' Rémy Coutable2016-10-052-22/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Refactor TrendingProjectsFinder to support cachingYorick Peterse2016-10-051-22/+31
| * | | | | | | | | | | | | | Exclude system notes from Project.trendingYorick Peterse2016-10-041-0/+8
* | | | | | | | | | | | | | | Merge branch 'desplacturing' into 'master' Jacob Schatz2016-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix test for SearchAutocomplete.Bryce Johnson2016-10-051-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-053-1/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-053-1/+143
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |