summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | | | | | | | | | Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'm...Robert Speicher2016-08-251-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Handle unavailable system infoSean McGivern2016-08-251-6/+2
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Display project icon from default branchHannes Rosenögger2016-08-251-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-241-22/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-241-22/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Restore get_id in ExtractsPathwinniehell2016-08-241-8/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix-file-links-on-project-page' into 'master' Douwe Maan2016-08-231-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix file links on project page Files viewfix-file-links-on-project-pageSean McGivern2016-08-231-1/+8
* | | | | | | | | | | | | | Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-232-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-2/+9
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Split Koding admin/user docsAchilleas Pipinellis2016-08-221-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Todos sorting dropdownissue_18135Felipe Artur2016-08-191-0/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-192-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-0/+17
* | | | | | | | | | | | | Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Added text color to issues labels in issue board listsPhil Hughes2016-08-191-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-194-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \