summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Restore some changes from !9199Rubén Dávila2017-09-062-1/+3
* Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-066-3/+23
|\
| * Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-067-10/+23
| * Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
* | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-067-9/+16
|\ \
| * | rework the contributor badgemicael.bergeron2017-09-061-7/+4
| * | round of fixes after code reviewmicael.bergeron2017-09-061-2/+5
| * | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-067-9/+16
| |/
* | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-5/+7
|\ \
| * \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-063-6/+32
| |\ \
| * | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-5/+7
* | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
|\ \ \ \
| * | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
* | | | | Profile updates from providersAlexander Keramidas2017-09-061-2/+0
| |_|_|/ |/| | |
* | | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-061-1/+1
* | | | Add functionality to collapse outdated diff comments regardless of discussion...Ashley Dumaine2017-09-061-0/+1
| |_|/ |/| |
* | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-053-6/+32
| |/ |/|
* | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-18/+28
* | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-21/+57
|\ \
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-313-5/+15
| |\ \
| * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-311-1/+1
| |\ \ \
| * | | | Fix specsDouwe Maan2017-08-301-1/+1
| * | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-308-19/+45
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-233-6/+19
| |\ \ \ \ \
| * | | | | | No explicit `to_a` or instance variables needed.Douwe Maan2017-08-182-9/+15
| * | | | | | Prefer polymorphism over `is_a?`Douwe Maan2017-08-171-2/+2
| * | | | | | Remove cross-references user cannot see from issue discussions JSONDouwe Maan2017-08-171-3/+5
| * | | | | | Remove view=full_data from NotesControllerDouwe Maan2017-08-171-6/+2
| * | | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-1711-26/+41
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-128-28/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-103-5/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-0810-45/+126
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Convert ?full_data=1 -> ?view=full_dataSean McGivern2017-08-071-2/+4
| * | | | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-042-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Keep the replies when the user leaves the pageFilipa Lacerda2017-08-031-1/+1
| * | | | | | | | | | | [ci skip] Enable etag pollingFilipa Lacerda2017-08-021-0/+7
| * | | | | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-011-17/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-3118-126/+148
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add data required for note formDouwe Maan2017-07-211-2/+6
| * | | | | | | | | | | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-212-19/+38
* | | | | | | | | | | | | | Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-013-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Rollsback changes made to signing_enabled.Tiago Botelho2017-09-013-8/+6
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '31273-creating-an-project-within-an-internal-sub-group-gives-th...Tim Zallmann2017-08-311-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add check for access to NamespaceRubén Dávila2017-08-301-1/+4
| * | | | | | | | | | | | | Address some suggestions from first code reviewRubén Dávila2017-08-291-10/+1
| * | | | | | | | | | | | | Build Project in context of Namespace if availableRubén Dávila2017-08-261-1/+10
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '37266-nomethoderror-undefined-method-current_application_settin...Douwe Maan2017-08-311-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+3
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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
View Lorry Controller Status