summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-181-32/+41
|\
| * refactored specJames Lopez2016-02-171-9/+12
| * refactored some stuff based on MR feedbackJames Lopez2016-02-171-54/+30
| * refactored GitPushService and updated specJames Lopez2016-02-151-24/+24
| * attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-111-26/+56
* | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-0/+34
* | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-171-0/+14
|\ \
| * | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-171-0/+14
* | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-175-36/+47
|\ \ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-174-9/+54
| |\ \ \
| * | | | Add newlineJacob Vosmaer2016-02-171-1/+1
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-1749-589/+1440
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix APIJacob Vosmaer2016-02-112-3/+26
| * | | | First version of "git archive" headersJacob Vosmaer2016-02-023-33/+21
* | | | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-171-0/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-171-0/+12
| | |/ / | |/| |
* | | | Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-9/+12
|\ \ \ \
| * | | | Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-9/+12
* | | | | Expire caches after forking/importing a repositoryYorick Peterse2016-02-173-0/+42
| |/ / / |/| | |
* | | | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-165-26/+81
|\ \ \ \
| * | | | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-115-26/+81
| | |_|/ | |/| |
* | | | Merge branch 'fix/cross-reference-notes-forks' into 'master' Douwe Maan2016-02-161-0/+15
|\ \ \ \
| * | | | 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 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1016-182/+485
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | WIP - fix and spec for cross reference issue with forksJames Lopez2016-02-041-0/+16
* | | | | | | | Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-161-0/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-0/+37
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-0/+32
|/ / / / / / /
* | | | | | | Merge branch 'fix/ci-emails-broken-link' into 'master' Douwe Maan2016-02-134-271/+291
|\ \ \ \ \ \ \
| * | | | | | | Move profile notifications specs to separate filefix/ci-emails-broken-linkGrzegorz Bizon2016-02-122-98/+107
| * | | | | | | Move build emails specs to separate fileGrzegorz Bizon2016-02-123-177/+186
| * | | | | | | Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-121-38/+40
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-16/+4
|/ / / / / /
* | | | | | 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 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-3/+37
|\ \ \ \ \ \ \
View Lorry Controller Status