summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-314-21/+26
* Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-314-23/+12
* Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-301-1/+1
|\
| * Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-301-1/+1
| * Added project specific enable/disable setting for LFSPatricio Cano2016-08-301-1/+1
* | Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-301-7/+37
|\ \ | |/
| * Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-267-92/+19
| |\
| * | Extract ref_name and path in before_action, feedback:Lin Jen-Shin2016-08-261-5/+10
| * | Just use instance variable instead, feedback:Lin Jen-Shin2016-08-251-7/+2
| * | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2413-11/+62
| |\ \
| * | | Path could also have slashes! Feedback:Lin Jen-Shin2016-08-241-3/+11
| * | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1912-30/+132
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-187-14/+306
| |\ \ \ \
| * | | | | Not sure why I missed this renamingLin Jen-Shin2016-08-181-1/+1
| * | | | | Use path rather than URL because it should work for http 302:Lin Jen-Shin2016-08-181-2/+2
| * | | | | Use switch case in a helper, feedback:Lin Jen-Shin2016-08-171-7/+3
| * | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1712-28/+136
| |\ \ \ \ \
| * | | | | | Rename to latest_succeeded, feedback:Lin Jen-Shin2016-08-161-1/+1
| * | | | | | Use URL helper, feedback:Lin Jen-Shin2016-08-161-3/+7
| * | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1616-122/+319
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1028-148/+241
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-07-257-42/+55
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'artifacts-from-ref-and-build-name-api' into artifacts-from-ref-...Lin Jen-Shin2016-07-2116-55/+97
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename latest_success* to latest_successful:Lin Jen-Shin2016-07-191-1/+1
| * | | | | | | | | | Merge branch 'master' into artifacts-from-ref-and-build-nameLin Jen-Shin2016-07-1814-99/+183
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use find_by, feedback:Lin Jen-Shin2016-07-181-1/+1
| * | | | | | | | | | | Introduce Project#latest_success_builds_for:Lin Jen-Shin2016-07-151-2/+2
| * | | | | | | | | | | Update routes based on feedback from:Lin Jen-Shin2016-07-141-1/+1
| * | | | | | | | | | | Rename to ref_name so it's aligning with APILin Jen-Shin2016-07-131-2/+2
| * | | | | | | | | | | Could be faster when params[:path] is missingLin Jen-Shin2016-07-121-2/+2
| * | | | | | | | | | | Add all the tests and fix stuffs along the way:Lin Jen-Shin2016-07-121-1/+1
| * | | | | | | | | | | Remove redundant returnLin Jen-Shin2016-07-111-1/+1
| * | | | | | | | | | | Using plain if/else is much easier to understandLin Jen-Shin2016-07-111-4/+4
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-07-1110-72/+103
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Give latest succeeded one, don't give pending/running onesLin Jen-Shin2016-07-111-1/+3
| * | | | | | | | | | | | Introduce Projects::ArtifactsController#search:Lin Jen-Shin2016-07-111-2/+22
* | | | | | | | | | | | | prevent authored awardable thumbs votesbarthc2016-08-301-5/+7
* | | | | | | | | | | | | prevent authored awardable thumbs votesbarthc2016-08-281-0/+2
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-linkStan Hu2016-08-251-1/+1
* | | | | | | | | | | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-252-52/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-252-52/+1
* | | | | | | | | | | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-251-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-1/+1
| * | | | | | | | | | | | | Disable comments on older merge request diffDmitriy Zaporozhets2016-08-221-0/+5
| * | | | | | | | | | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-229-7/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1928-72/+574
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1525-175/+385
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-021-1/+0
| * | | | | | | | | | | | | | Add ability to render different merge request versionsDmitriy Zaporozhets2016-08-021-1/+7