summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-148-34/+102
|\
| * Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-141-5/+5
| * Improvements, readability for artifacts browserGrzegorz Bizon2016-01-141-7/+7
| * Check if file exists in metadata in download actionGrzegorz Bizon2016-01-141-3/+8
| * Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-141-1/+4
| * Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-1/+7
| * Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-1/+1
| * Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-0/+1
| * Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-141-4/+1
| * Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-2/+2
| * Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-141-2/+2
| * Add artifacts metadata uploader filedGrzegorz Bizon2016-01-141-1/+1
| * Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-141-0/+2
| * Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-141-4/+1
| * Add artifacts browserGrzegorz Bizon2016-01-141-4/+2
| * Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-1/+8
| * Move artifacts controller level upGrzegorz Bizon2016-01-141-2/+2
| * Add view action to artifacts controllerGrzegorz Bizon2016-01-141-0/+4
| * Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-142-27/+36
| * Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-1/+1
| * Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-071-1/+1
| * Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-072-0/+28
| * Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-0/+5
| |\
| | * Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+5
| | |\
| | | * Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-0312-63/+128
| | | |\
| | | * \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-125-27/+98
| | | |\ \
| | | * | | Refactor for style issuesJeff Stubler2015-11-111-2/+1
| | | * | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+6
| * | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
| |/ / / /
| * | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-041-3/+3
* | | | | 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
* | | | | Small fixes from code review. #3945Rubén Dávila2016-01-121-1/+1
* | | | | Reuse existent vars with ref and path. #3945Rubén Dávila2016-01-121-3/+1
* | | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-074-2/+9
* | | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-1/+1
|/ / / /
* | | | Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
* | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-244-121/+68
|\ \ \ \
| * | | | Add tests for new functionalityDouwe Maan2015-12-211-1/+5
| * | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-183-7/+15
| * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-184-120/+55
* | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
* | | | | Backport JIRA serviceDrew Blessing2015-12-181-2/+3
|/ / / /
* | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \
| * | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
* | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \ \ \ \ | |/ / / / |/| | | |