summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-074-8/+15
|\
| * Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-7/+10
| |\
| | * Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-074-209/+13
| | |\
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-069-15/+23
| | |\ \
| | * \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-062-18/+32
| | |\ \ \
| | * \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-041-2/+20
| | |\ \ \ \
| | * | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-312-7/+10
| * | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-072-1/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-072-1/+5
| | | |_|/ / | | |/| | |
* | | | | | Move issues index variable setting to a methodSean McGivern2017-09-071-14/+1
|/ / / / /
* | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-074-209/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-063-23/+55
| |\ \ \ \ | | |/ / /
| * | | | Fix specs BACKPORTFelipe Artur2017-09-041-1/+1
| * | | | Continue BE backportFelipe Artur2017-08-311-1/+1
| * | | | Group boards CE backportFelipe Artur2017-08-284-209/+13
* | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-064-3/+9
|\ \ \ \ \
| * | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-064-3/+9
| | |/ / / | |/| | |
* | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-065-7/+7
|\ \ \ \ \
| * | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-065-7/+7
| |/ / / /
* | | | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-062-6/+4
|\ \ \ \ \ | |/ / / /
| * | | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-052-6/+4
* | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-5/+7
|/ / / /
* | | | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-031-12/+28
| |_|/ |/| |
* | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-311-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-311-1/+1
| |\ \
| | * | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-311-1/+1
* | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-302-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '35793_fix_predicate_names' into 'master'Robert Speicher2017-08-291-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | replace `is_edited?` with `edited?`Maxim Rydkin2017-08-291-1/+1
| | |/
| * | Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-2/+2
| * | Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-2/+2
| |/
* | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-231-6/+3
|\ \ | |/
| * Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-221-6/+3
* | No explicit `to_a` or instance variables needed.Douwe Maan2017-08-181-4/+8
* | Remove cross-references user cannot see from issue discussions JSONDouwe Maan2017-08-171-3/+5
* | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-174-15/+20
|\ \ | |/
| * Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-162-14/+14
| |\
| | * Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-152-14/+14
| * | Many Repo FixesJacob Schatz2017-08-151-0/+5
| |/
| * Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-111-12/+0
| |\
| * | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
* | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-121-12/+0
|\ \ \ | | |/ | |/|
| * | Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
| |/
* | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-083-17/+44
|\ \ | |/
| * Merge branch 'master' into ideMike Greiling2017-08-071-5/+0
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-5/+0
| * | Fix ABC size of BlobController#showLuke "Jared" Bennett2017-08-041-24/+32
| * | Add render_error to blob JSONDouwe Maan2017-08-031-1/+2
| * | Clean up some backendDouwe Maan2017-08-031-6/+20
| * | Merge branch 'master' into ideDouwe Maan2017-08-032-18/+3
| |\ \ | | |/