summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
* 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_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
| |\
| * | Make the CI permission model simplerKamil Trzcinski2016-02-027-31/+10
* | | 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
|\ \
| * | 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 git-raw...Jacob Vosmaer2016-02-0112-54/+59
| |\ \ | | |/
| * | 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
| |\ \
| | * | [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 conflictsDouwe Maan2016-01-271-1/+1
| * | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-23/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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
| |\ \ \ | | |/ / | |/| |
| | * | 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 prote...Rubén Dávila2016-01-201-1/+4
| | * | 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
| | |/ /
| * | | 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 the adequate reference for the old rev. #3945Rubén Dávila2016-01-141-1/+1
| * | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-141-1/+1
| * | | Use current commit id if it doesn't have a parent. #3945Rubén Dávila2016-01-131-1/+1
| * | | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+2
View Lorry Controller Status