summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-1/+1
| | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
* Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-36/+18
| | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
|
* Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-171-1/+3
|\ | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1727-125/+190
| |\ | | | | | | | | | git-archive-refactor
| * | First version of "git archive" headersJacob Vosmaer2016-02-021-1/+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-3/+9
| |/ |/| | | | | Fixes #13367.
* | Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-161-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid ID Closes #13467 See merge request !2823
| * | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
| | | | | | | | | | | | Closes #13467
* | | Provide explicit html format when rendering git_not_found pagers-git_not_foundRobert Speicher2016-02-151-1/+1
| | | | | | | | | | | | | | | Prior, if the request format was, for example, .zip, we'd get an `ActionView::MissingTemplate` error.
* | | Properly render the `errors/git_not_found` pageRobert Speicher2016-02-151-1/+1
|/ /
* | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-121-5/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone order in project and issue edit lists to due_date _Originally opened at !2579 by @olirogers._ - - - This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001. This continues the work of !1934 to order milestones. I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome. See merge request !2780
| * | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-101-5/+6
| | |
* | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-112-10/+11
| | |
* | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-10/+4
| | |
* | | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
| | |
* | | Move badge implementation to builds controllerGrzegorz Bizon2016-02-112-16/+10
| | |
* | | Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+7
| | |
* | | Improve CI status badge implementationGrzegorz Bizon2016-02-111-3/+2
| | |
* | | Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+6
| | |
* | | Render 404 if there is no project for old CI status badgeGrzegorz Bizon2016-02-111-0/+1
| | |
* | | Add deprecation warning for old CI status badge actionGrzegorz Bizon2016-02-111-1/+4
| | | | | | | | | | | | | | | We keep this only for backwards compatibility with projects that have been migrated from GitLab CI. New project badge will go elsewhere.
* | | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-102-6/+20
|/ /
* | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-103-9/+50
|\ \ | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * | MR feedbackJosh Frye2016-02-093-6/+6
| | |
| * | Extract events rendering to own action.Josh Frye2016-02-093-15/+19
| | |
| * | Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-092-2/+39
| | | | | | | | | | | | ajax filter.
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0910-81/+13
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-057-13/+43
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-047-18/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| * | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-1/+1
| | | | |
| * | | | Clean Ci::ApplicationController from unused permission related codeKamil Trzcinski2016-02-032-50/+2
| | | | |
| * | | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
| * | | | Make the CI permission model simplerKamil Trzcinski2016-02-028-32/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-091-0/+1
| | | | |
* | | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-091-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
| * | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | Closes #11853
* | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-083-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
| * | | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-3/+1
| | | | |
| * | | | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-053-0/+11
| | | | |
* | | | | Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
| * | | | | Fix double pagingJosh Frye2016-02-051-1/+1
| | | | | |
* | | | | | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
| * | | | | Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Implement changes from MR feedbackJosh Frye2016-02-041-6/+6
| | | | |
* | | | | Various filter fixesJosh Frye2016-02-045-12/+22
| | | | |
* | | | | Paginate + ajax filter dashboard projectsJosh Frye2016-02-043-8/+21
| | | | |
* | | | | Page project list on dashboardJosh Frye2016-02-041-0/+2
|/ / / /
* | | | Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-041-2/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
| * | | Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-031-2/+7
| | | | | | | | | | | | | | | | Closes #12653
View Lorry Controller Status