summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'sh-fix-events-update-spec' into 'master' Yorick Peterse2016-10-071-1/+4
|\ \ \ \ \ \
| * | | | | | Fix Event#reset_project_activity updatessh-fix-events-update-specStan Hu2016-10-061-1/+4
* | | | | | | Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-071-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Call ensure_secret_token! in secret token test's before block since it would ...Justin DiPierro2016-10-061-0/+1
| * | | | | | | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-3/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' Rémy Coutable2016-10-071-0/+30
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update API docs and specs for /projects/visibleSean McGivern2016-10-041-2/+21
| * | | | | | api: add /projects/visible API endpointBen Boeckel2016-10-041-0/+11
* | | | | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-072-2/+16
* | | | | | | Use CacheMarkdownField for notesNick Thomas2016-10-072-41/+24
* | | | | | | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-0712-16/+287
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '23025-issue-boards-defaults' into 'master' Jacob Schatz2016-10-062-7/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update issue board specAnnabel Dunstone Gray2016-10-062-7/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-063-0/+131
|\ \ \ \ \
| * | | | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-053-0/+131
* | | | | | Update user routing spec after constrainer logic changeddz-root-urlDmitriy Zaporozhets2016-10-061-1/+1
* | | | | | Make user constrainer lookup same as controller and add more constrainer testsDmitriy Zaporozhets2016-10-063-1/+20
* | | | | | Fix users feature specDmitriy Zaporozhets2016-10-061-13/+2
* | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-065-3/+53
| |/ / / / |/| | | |
* | | | | Merge branch 'issue-boards-new-issue' into 'master' Fatih Acet2016-10-063-7/+170
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add tests to Projects::Boards::IssuesController#create actionDouglas Barbosa Alexandre2016-10-061-7/+57
| * | | | Add service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-061-0/+33
| * | | | Added testsPhil Hughes2016-10-061-0/+80
* | | | | Revert "Label list shows all issues (opened or closed) with that label"Douglas Barbosa Alexandre2016-10-061-4/+4
* | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \