summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-4/+11
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Fix MySQL failure for emoji autocompleteSean McGivern2017-08-301-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Add filter by my reactionHiroyuki Sato2017-08-301-1/+17
* | | | | | | | | | | | Merge branch 'mr-index-eager-load' into 'master'Douwe Maan2017-08-301-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Eager load head pipeline projects for MRs indexmr-index-eager-loadYorick Peterse2017-08-281-1/+11
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '35793_fix_predicate_names' into 'master'Robert Speicher2017-08-292-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | replace `is_legacy_group_milestone?` with `legacy_group_milestone?`Maxim Rydkin2017-08-291-3/+3
| * | | | | | | | | | | 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
|/ / / / / / / / / /
* | | | | | | | | | Define ldap methods at runtimeBob Van Landuyt2017-08-242-8/+8
* | | | | | | | | | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-241-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-231-0/+9
|\ \ \ \ \ \ \ \ \