summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-15/+0
| |/
* | Add ignore white space option in merge request diffMinsik Yoon2015-11-132-0/+44
|/
* Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-6/+29
|\
| * Only postgres does case sensitive comparesproject-path-case-sensitivityDouwe Maan2015-10-221-1/+1
| * Don't load entire spec with MySQLDouwe Maan2015-10-211-8/+10
| * Disable case sensitive spec for MySQL.Douwe Maan2015-10-211-0/+3
| * Prefer project with exact path to differently cased one when both exist.Douwe Maan2015-10-201-6/+24
* | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-203-15/+91
|/
* Fix duplicate repositories in GitHub import pageStan Hu2015-10-191-1/+1
* Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-191-0/+74
|\
| * Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'm...Douwe Maan2015-10-191-0/+46
| |\
| | * Tweak wording.Douwe Maan2015-10-181-2/+2
| | * Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-172-30/+2
| | |\
| | * | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-10/+16
| | * | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-0/+40
| * | | Make spec names more clearDouwe Maan2015-10-171-3/+6
| * | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-176-57/+62
| |\ \ \ | | | |/ | | |/|
| * | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-0/+25
* | | | Satisfy Rubocopjrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-181-7/+6
* | | | Fix spec.Douwe Maan2015-10-181-33/+53
* | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-184-53/+38
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-153-25/+38
| |\ \ \
| | * | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-141-2/+2
| | | |/ | | |/|
| | * | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-071-23/+0
| | |\ \
| | | * | Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-23/+0
| | * | | Add directory feature buttonStan Hu2015-10-071-0/+36
| | |/ /
View Lorry Controller Status