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-267-92/+19
|\
| * 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
| |/ / / / /
* | | | | | 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-7/+79
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-182-0/+15
| | |\ \ \ \ \
| | * | | | | | Fix adding a user to a group in admin sectionSean McGivern2016-08-181-1/+1
| | * | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-189-23/+38
| | |\ \ \ \ \ \
| | * | | | | | | Allow project group links to be expiredSean McGivern2016-08-181-1/+3
| | * | | | | | | Add expiration date to group membershipsSean McGivern2016-08-181-2/+7
| | * | | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1842-287/+937
| | |\ \ \ \ \ \ \
| | * | | | | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-051-1/+1
| | * | | | | | | | Replace optional parameters with keyword arguments.Adam Niedzielski2016-08-021-1/+6
| | * | | | | | | | WIPAdam Niedzielski2016-08-011-1/+1
| * | | | | | | | | Merge branch 'cs-async-branch-dropdown' into 'master' Jacob Schatz2016-08-191-0/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Fix tests.Connor Shea2016-08-171-1/+1
| | * | | | | | | | Initial implementation of an async branch dropdown for Revert and Cherry Pick.Connor Shea2016-08-171-0/+7
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /