summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-081-26/+0
|\
| * Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-081-26/+0
* | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-081-5/+26
|\ \ | |/ |/|
| * Refactor compared_diff_version method in merge requests controllerdz-mr-version-compareDmitriy Zaporozhets2016-09-071-6/+2
| * Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-6/+2
| * Improve merge request version featureDmitriy Zaporozhets2016-09-071-7/+5
| * Refactor code for merge request version compare featureDmitriy Zaporozhets2016-09-071-14/+30
| * Compare merge request version against other version on changes pageDmitriy Zaporozhets2016-09-071-1/+16
* | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-071-5/+4
|/
* Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-051-0/+1
|\
| * Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-311-0/+1
* | Fix missing flash messages on service edit pageAirat Shigapov2016-09-051-3/+2
* | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' Douwe Maan2016-09-021-2/+2
|\ \
| * | Update specs - add mocks to simulate old versionsTomasz Maczukin2016-09-011-2/+2
| * | Change 404 to 410 error when raw trace is unavailableTomasz Maczukin2016-09-011-1/+1
| * | Handle error on trace raw download with old builds (DB stored)Tomasz Maczukin2016-09-011-1/+1
* | | Merge branch 'issue-boards-issues-total-count' into 'master' Fatih Acet2016-09-011-6/+9
|\ \ \
| * | | Returns the total number of issues in the JSON responseDouglas Barbosa Alexandre2016-08-311-6/+9
| | |/ | |/|
* | | Project tools visibility levelFelipe Artur2016-09-017-7/+7
| |/ |/|
* | add specs for tags findertag-name-filtertiagonbotelho2016-08-311-1/+4
* | filters tags by nametiagonbotelho2016-08-311-1/+2
|/
* Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-263-4/+14
|\
| * Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-linkStan Hu2016-08-251-1/+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-224-4/+18
| | |\
| | * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1918-38/+466
| | |\ \
| | * | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-1/+1
| | * | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1516-159/+367
| | |\ \ \
| | * | | | 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
| * | | | | Display project icon from default branchHannes Rosenögger2016-08-251-1/+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-246-6/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-2/+9
| | |_|_|/ | |/| | |
| * | | | 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-192-3/+10
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-193-7/+79
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-0/+10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-185-10/+5
| | |\ \ \ \ \
| | * | | | | | Allow project group links to be expiredSean McGivern2016-08-181-1/+3
| | * | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1825-186/+758
| | |\ \ \ \ \ \
| | * | | | | | | 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