summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-1/+14
* Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-2/+2
* Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-1/+1
|\
| * add the uploader context to the upload modelMicaël Bergeron2018-02-021-1/+1
* | Replace $.ajax in admin broadcast messages with axiosClement Ho2018-02-051-1/+4
* | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-051-0/+23
|\ \
| * | Refactor UserCalloutsController enum checkMatija Čupić2018-02-051-7/+3
| * | Change UserCallout feautre_name to enumMatija Čupić2018-02-031-1/+5
| * | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0220-127/+153
| |\ \
| * | | Rename Callout to UserCalloutMatija Čupić2018-02-021-1/+1
| * | | Refactor CalloutsControllerMatija Čupić2018-02-021-3/+7
| * | | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-14/+6
| * | | Implement Callouts controllerMatija Čupić2018-01-261-0/+27
* | | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-0514-0/+79
|\ \ \ \ | |_|/ / |/| | |
| * | | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-0114-0/+79
* | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0211-31/+25
| |_|/ |/| |
* | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-015-86/+103
|/ /
* | Merge branch '30106-group-issues' into 'master'Sean McGivern2018-02-011-0/+1
|\ \
| * | Include subgroup issuables on the group page30106-group-issuesJarka Kadlecová2018-02-011-0/+1
* | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-012-2/+2
|\ \ \
| * | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-012-2/+2
* | | | refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-groupJames Lopez2018-01-311-2/+2
|/ / /
* | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+5
|\ \ \
| * | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+5
| | |/ | |/|
* | | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-1/+0
* | | Make pagination optional for issuablesJan Provaznik2018-01-301-5/+15
|/ /
* | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-251-1/+1
|/
* Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-241-1/+2
* Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errorsStan Hu2018-01-231-0/+2
* Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-1/+5
* Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-201-1/+1
|\
| * Fix Shows signin tab after new user email confirmationJacopo2018-01-181-1/+1
* | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-181-1/+1
|\ \
| * | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-1/+1
* | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-181-20/+26
| |/ |/|
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-182-13/+3
|\ \
| * | reference triggers.values for permitted parametersAlexis Reigel2018-01-172-14/+3
| * | add missing permitted paramAlexis Reigel2018-01-171-0/+1
* | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-181-1/+1
|\ \ \ | |_|/ |/| |
| * | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-181-1/+1
* | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-175-13/+29
|\ \ \ | |/ / |/| |
| * | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-161-0/+9
| * | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-162-5/+8
| * | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-162-8/+12
* | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-3/+12
|/ /
* | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-161-5/+1
|\ \
| * | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-151-5/+1
* | | Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-1/+13
* | | Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-121-1/+1
|\ \ \ | |/ / |/| |
| * | Use simple Next/Prev paging for jobs to avoid large count queries on arbitrar...disable-pages-on-jobsGreg Stark2018-01-111-1/+1
View Lorry Controller Status