summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* 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-1715-56/+66
| |\ | | | | | | | | | 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.
* | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
| | | | | | | | Closes #13467
* | 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
| | |
* | | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-102-6/+20
|/ /
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-097-31/+10
|\ \
| * \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-043-18/+11
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| * | | Make the CI permission model simplerKamil Trzcinski2016-02-027-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-18/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * | | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| | |/ | |/|
| * | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-0112-54/+59
| |\ \ | | |/ | | | | | | git-raw-workhorse
| * | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+2
| | |
| * | No need for base64 anymoreJacob Vosmaer2016-01-281-2/+0
| | |
| * | Send more raw blob data with workhorseJacob Vosmaer2016-01-282-8/+7
| | |
| * | Prototype of Git blobs via workhorseJacob Vosmaer2016-01-151-11/+6
| | |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-018-49/+52
|\ \ \ | | |/ | |/|
| * | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background process note logic for #3948 Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist. ``` without background processing Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms) Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms) Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms) with background processing Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms) Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms) Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms) ``` As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount. @dzaporozhets @yorickpeterse I would love some input on this. See merge request !2631
| | * | [WIP] Background process note logic for #3948Josh Frye2016-01-281-1/+1
| | | |
| * | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| | * | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-1/+1
| | | | |
| * | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-23/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| | * | | Move blame group logic to dedicated classDouwe Maan2016-01-281-27/+1
| | | | |
| | * | | Fix highlighting in blame view.Douwe Maan2016-01-271-0/+4
| | |/ /
| * | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-1/+10
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| | * | Some CSS and sorting fixes.Rubén Dávila2016-01-201-2/+2
| | | |
| | * | Add ability to sort forks. #2406Rubén Dávila2016-01-201-0/+2
| | | |
| | * | Add fork button and implement ability to distinguish between public and ↵Rubén Dávila2016-01-201-1/+4
| | | | | | | | | | | | | | | | protected forks. #2406
| | * | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-201-1/+2
| | | |
| | * | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-201-0/+3
| | | |
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
| | | |
| * | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-12/+10
| |\ \ \
| | * | | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-12/+10
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2
| * | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-1/+3
| | | |
| * | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-202-4/+8
| | | |
| * | | Merge branch 'master' into issue_3945Douwe Maan2016-01-206-6/+7
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-148-34/+102
| |\ \ \ | | | |/ | | |/|
| * | | More refactoring from last code review. #3945Rubén Dávila2016-01-143-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
View Lorry Controller Status