summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Incorporate reviewZeger-Jan van de Weg2016-03-151-5/+14
* Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-35/+56
* Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-153-3/+3
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-141-2/+2
|\
| * Fix denting and specZeger-Jan van de Weg2016-03-131-2/+2
* | Remove unnecessary go-get test (superseded by middleware)Stan Hu2016-03-121-13/+0
|/
* Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-13/+24
|\
| * Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-13/+24
* | Make better use of the `visibility_level` factory traitsrs-traits-are-goodRobert Speicher2016-03-081-1/+1
|/
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-032-5/+5
* Merge branch 'issue_13648' into 'master' Douwe Maan2016-03-031-0/+72
|\
| * Add specs to ForksController#index.issue_13648Rubén Dávila2016-03-021-0/+72
* | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' Douwe Maan2016-03-021-0/+53
|\ \ | |/ |/|
| * Do not require authentication for CI status badgefix/deprecated-ci-badge-permissionsGrzegorz Bizon2016-03-011-12/+11
| * Fix specs for deprecated CI build status badgeGrzegorz Bizon2016-03-011-1/+2
| * Fix deprecated CI build status badge permissionsGrzegorz Bizon2016-03-011-0/+53
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-294-4/+4
|\ \ | |/
| * Add `:with_avatar` trait to User factoryRobert Speicher2016-02-243-3/+3
| * Merge branch 'fix-autocomplete-spec' into 'master'Robert Speicher2016-02-231-1/+1
* | include contributions from forked projects on profile calendarJames Lopez2016-02-221-0/+18
|/
* Merge branch 'rs-move-controller-specs' into 'master' Douwe Maan2016-02-205-0/+0
|\
| * Move a few controller specs to their correct locationsrs-move-controller-specsRobert Speicher2016-02-185-0/+0
* | Fix build and add specsRubén Dávila2016-02-191-0/+49
|/
* Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-0/+34
* Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-171-8/+3
|\
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-174-1/+109
| |\
| * | First version of "git archive" headersJacob Vosmaer2016-02-021-8/+3
* | | 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
| |/ |/|
* | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-0/+37
* | 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
* | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-041-0/+8
|\ \
| * | refactored migration and spec based on feedbackJames Lopez2016-02-041-2/+2
| * | refactor previous test and add validation to project modelJames Lopez2016-01-291-6/+3
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-01-293-14/+132
| |\ \ | | |/
| * | WIP - spec failure on .atom project URLJames Lopez2016-01-221-0/+11
* | | Fix rubocop offensesDouglas Barbosa Alexandre2016-02-021-4/+1
* | | Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-21/+14
* | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-0/+47
| |/ |/|
* | Move blame group logic to dedicated classDouwe Maan2016-01-281-14/+0
* | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-0/+23
|\ \
| * | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-0/+23
| |/
* | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-0/+109
|/
* Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+26
|\
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+26
* | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+26
* | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-9/+26
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+66
* Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-041-55/+25
* Fix specsDouwe Maan2015-12-181-2/+2
View Lorry Controller Status