summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-7/+34
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-7/+34
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| | | * | | | Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-7/+17
| | | | | | |
| | | * | | | Move the file serving to Raw controller, add a few ifs to view.Marin Jankovski2015-12-032-24/+24
| | | | | | |
| | | * | | | If a user clicks on the LFS object, it should be served if the user has ↵Marin Jankovski2015-12-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | access to the object.
| * | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-084-14/+24
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-3/+2
| | |\ \ \ \ \
| | | * | | | | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-3/+2
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response
| | * | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-071-0/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-073-2/+3
| | | |\ \ \ \ \
| | | * | | | | | sort milestones by due_dateGreg Smethells2015-12-031-0/+2
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-071-10/+19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936
| | | * | | | | | Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-031-1/+6
| | | | | | | | |
| | | * | | | | | Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
| | | |/ / / / /
| | * | | | | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-071-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating global milestones with Unicode characters 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 See merge request !1983
| | | * | | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0718-108/+190
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Notify user if they cannot create projectsAndrew Tomaka2015-12-051-0/+1
| | |/ / / /
| | * | | | Add authorization to new branch/tag pages.new-tag-branch-authorizationDouwe Maan2015-12-032-2/+2
| | |/ / /
| | * | | Be more explicit with the impersonate return URLAndrew Tomaka2015-12-021-1/+1
| | | | |
| | * | | Prevent impersonation if blockedAndrew Tomaka2015-12-021-5/+11
| | | | |
| | * | | Merge pull request #9846 from fbeegle/masterDmitriy Zaporozhets2015-12-021-1/+1
| | |\ \ \ | | | | | | | | | | | | Update autocomplete_controller to be more readable
| | | * | | Update autocomplete_controller to be more readableFelipe Orlando2015-11-221-1/+1
| | | | | |
| | * | | | Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu2015-12-011-1/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Add ignore whitespace change option to commit view
| | | * | | | Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-1/+6
| | | | | | |
| | * | | | | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-301-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | See merge request !1916
| | | * | | | | Fix 404 in redirection after removing a projectStan Hu2015-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
| | * | | | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | |
| | | * | | | | Migrate mailers to ActiveJobValery Sizov2015-11-261-1/+1
| | | |/ / / /
| | * | | | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-262-6/+2
| | | | | | |
| | * | | | | Fix raw private snippets access workflowDouglas Barbosa Alexandre2015-11-251-1/+1
| | |/ / / /
| | * | | | Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-221-1/+1
| | |/ / /
| | * | | Award: merge request fixValery Sizov2015-11-211-2/+5
| | | | |
| | * | | Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-211-27/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27/+22
| | | | | |
| | * | | | Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-1/+1
| | | | | |
| | * | | | Merge branch 'ci-yaml-validation' into 'master' Kamil Trzciński2015-11-191-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827
| | | * | | | Don't rescue Exception, but StandardErrorci-yaml-validationKamil Trzcinski2015-11-191-2/+2
| | | |/ / /
| | * | | | Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-193-3/+27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| | | * | | | adressing commentsValery Sizov2015-11-191-6/+6
| | | | | | |
| | | * | | | satisfy rubocopValery Sizov2015-11-191-2/+2
| | | | | | |
| | | * | | | Emoji: fix image of emoji when it is submitted via commentValery Sizov2015-11-191-0/+1
| | | | | | |
| | | * | | | award for merge requests[ci skip]Valery Sizov2015-11-191-1/+1
| | | | | | |
| | | * | | | award emojiValery Sizov2015-11-193-3/+26
| | | | | | |
| | * | | | | Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' ↵Robert Speicher2015-11-191-1/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Improve personal snippet access workflow. Replaces !1709 Fixes #3258 See merge request !1817
| | | * \ \ \ \ Merge branch 'master' into ↵Douwe Maan2015-11-1720-91/+194
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow
| | | * \ \ \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-099-29/+93
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-032-3/+3
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into fix-personal-snippet-access-workflowDouglas Barbosa Alexandre2015-11-021-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |