summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* updated system note service and spec based on feedbackJames Lopez2016-02-161-4/+0
* fix rubocop warningJames Lopez2016-02-121-2/+4
* woo hoo - getting there with the cross-reference issue. Should fix the proble...James Lopez2016-02-121-4/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-128-33/+132
|\
| * Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-125-30/+82
| |\
| | * Validate email addresses using Devise.email_regexpRémy Coutable2016-02-095-30/+82
| * | Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'ma...Douwe Maan2016-02-121-3/+12
| |\ \
| | * | Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestoneRémy Coutable2016-02-091-3/+12
| * | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' in...Rémy Coutable2016-02-111-0/+22
| |\ \ \
| | * | | Pass current_user to merge_request.closes_issues in API ans streamline MR API...Schniz/gitlab-ce-feature/merge-request-closes-issues-in-apiRémy Coutable2016-02-112-18/+8
| | * | | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' r...Gal Schlezinger2016-02-112-0/+32
| * | | | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into '...Robert Speicher2016-02-101-0/+10
| |\ \ \ \
| | * | | | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-0/+10
| * | | | | Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' Robert Speicher2016-02-101-0/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commitsTony Chu2016-02-081-0/+6
| | |/ / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1016-182/+485
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-3/+37
| |\ \ \ \
| | * | | | Smarter flushing of branch statistics cachesYorick Peterse2016-02-092-3/+37
| * | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-095-77/+187
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-085-77/+187
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix commit status testsKamil Trzcinski2016-02-061-18/+30
| | | * | | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-055-26/+51
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-0415-31/+278
| | | |\ \ \ \
| | | * | | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-043-55/+153
| | | * | | | | Make the CI permission model simplerKamil Trzcinski2016-02-021-4/+4
| * | | | | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-091-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add an API spec for MergeRequest#merge_status and properly document this reso...develop7/add-merge_status-to-merge-request-in-apiRémy Coutable2016-02-081-0/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'fix/max-attachment-size-setting-validation'Douwe Maan2016-02-091-0/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-091-0/+8
| * | | | | | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai...Douwe Maan2016-02-091-0/+37
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-091-0/+37
| | |/ / / / / /
| * | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan2016-02-091-0/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Validate uniqueness of milestone title per projectZeger-Jan van de Weg2016-02-081-0/+14
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse2016-02-092-3/+114
| |\ \ \ \ \ \
| | * | | | | | Cache various Repository Git operationscaching-repository-git-operationsYorick Peterse2016-02-082-3/+114
| | |/ / / / /
| * | | | | | Merge branch 'ci/improve-ci-build-api' into 'master' Kamil Trzciński2016-02-092-93/+55
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Extract shared context level up in build specsci/improve-ci-build-apiGrzegorz Bizon2016-02-041-56/+17
| | * | | | | Remove unmaintainable db schema comment from build factoryGrzegorz Bizon2016-02-041-27/+0
| | * | | | | Improve CI API specs related to operations on buildGrzegorz Bizon2016-02-042-21/+49
| * | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-081-1/+27
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookieRobert Speicher2016-02-051-5/+19
| | * | | | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-1/+13
| * | | | | | Project dropdown test span -> iPhil Hughes2016-02-051-1/+1
| * | | | | | Changed the project switcher dropdown togglePhil Hughes2016-02-051-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-051-6/+6
| |/ / / /
* | | | | fixed spec - at last!James Lopez2016-02-051-3/+2
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-054-20/+45
|\ \ \ \ \ | |/ / / /
| * | | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-041-18/+15
| * | | | Merge branch 'fix-test' into 'master' Dmitriy Zaporozhets2016-02-041-2/+2
| |\ \ \ \
| | * | | | Fix broken testsDmitriy Zaporozhets2016-02-041-2/+2
View Lorry Controller Status