summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+34
|\ | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * 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 ↵Stan Hu2015-12-051-3/+2
| | | | | | | | | | | | MilestonesController
| * | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
* | 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 view
| * 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
|\ \ | | | | | | | | | See merge request !1916
| * | Fix 404 in redirection after removing a projectStan Hu2015-11-251-0/+16
| | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
* | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-16/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * | 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 AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833
| * Reduce method complexity in AutocompleteControlleree-flogDouwe Maan2015-11-201-4/+5
| |
* | Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' ↵Robert Speicher2015-11-191-0/+118
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | into 'master' Improve personal snippet access workflow. Replaces !1709 Fixes #3258 See merge request !1817
| * Merge branch 'master' into ↵Douwe Maan2015-11-173-15/+44
| |\ | | | | | | | | | dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow
| * | 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
| |/ |/| | | | | | | | | | | Previously this controller would in multiple places load tons (read: around 65000) project and/or group IDs into memory. These changes in combination with the previous commits significantly cut down loading times of user profile pages and the Atom feeds of users.
* | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-15/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
| * | refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-15/+0
| |/ | | | | | | | | | | Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
* | Add ignore white space option in merge request diffMinsik Yoon2015-11-132-0/+44
|/ | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-6/+29
|\ | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * 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
|/ | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* Fix duplicate repositories in GitHub import pageStan Hu2015-10-191-1/+1
| | | | | | | | | | | | | By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
* Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-191-0/+74
|\ | | | | | | [ci skip]
| * Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-191-0/+46
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
| | * 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
| | | | | | | | | | | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
| | * | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
| * | | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| | | * | Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-23/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add directory feature buttonStan Hu2015-10-071-0/+36
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557