summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-191-0/+49
* Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-181-0/+34
* 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
* Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-2/+2
* Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+34
|\
| * All for you rubocop.Marin Jankovski2015-12-081-2/+2
| * Stub the calls to disk and check what send_file returns.Marin Jankovski2015-12-081-1/+3
| * Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-081-1/+1
| * Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-0/+32
* | Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-072-3/+29
|\ \
| * | Fix spec that broke due to fact that iid is needed, not id, for MilestonesCon...Stan Hu2015-12-051-3/+2
| * | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+27
| |/
* | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-042-0/+44
|/
* Prevent impersonation if blockedAndrew Tomaka2015-12-021-0/+19
* Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu2015-12-011-0/+15
|\
| * Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-0/+15
* | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-301-0/+16
|\ \
| * | Fix 404 in redirection after removing a projectStan Hu2015-11-251-0/+16
* | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-16/+20
|\ \ \ | |_|/ |/| |
| * | fix specsrails_update_to_4_2Valery Sizov2015-11-301-16/+20
| |/
* | Fix raw private snippets access workflowDouglas Barbosa Alexandre2015-11-251-0/+115
|/
* Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-211-4/+5
|\
| * Reduce method complexity in AutocompleteControlleree-flogDouwe Maan2015-11-201-4/+5
* | Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' int...Robert Speicher2015-11-191-0/+118
|\ \ | |/ |/|
| * Merge branch 'master' into dbalexandre/gitlab-ce-fix-personal-snippet-access-...Douwe Maan2015-11-173-15/+44
| |\
| * | Improve personal snippet access workflow. Fixes #3258Douglas Barbosa Alexandre2015-10-291-0/+118
* | | Refactor UsersController to not kill the databaseYorick Peterse2015-11-181-5/+18
| |/ |/|
* | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-15/+0
|\ \
View Lorry Controller Status