summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Expand)AuthorAgeFilesLines
* Render MR Notes with Vue with behind a cookieFatih Acet2018-02-282-2/+26
* Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-271-15/+38
* Move the #update action from Project/Member controllers to the MembershipActi...Rémy Coutable2018-02-271-0/+12
* Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-271-4/+9
* Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-232-2/+30
|\
| * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-222-2/+30
* | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-221-1/+4
|\ \ | |/ |/|
| * Fix 500 error when loading an invalid upload URLSean McGivern2018-02-221-1/+4
* | Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritanceSean McGivern2018-02-213-5/+14
|/
* Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-071-0/+1
|\
| * Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-064-17/+55
| |\
| * \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-311-5/+15
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-293-5/+18
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-174-3/+2
| |\ \ \ \
| * | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-021-0/+1
* | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-071-2/+4
| |_|_|_|/ |/| | | |
* | | | | 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
* | | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-022-6/+4
|/ / / / /
* | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-11/+50
* | | | | 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
| | |_|/ | |/| |
* | | | Make pagination optional for issuablesJan Provaznik2018-01-301-5/+15
|/ / /
* | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-1/+5
* | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-1/+1
* | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-3/+12
| |/ |/|
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-112-0/+2
* | Improve filtering issues by label performanceissue_40500Felipe Artur2018-01-052-3/+0
|/
* Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-181-1/+0
|\
| * Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-181-1/+0
* | Backport changes from EELin Jen-Shin2017-12-151-1/+1
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-156-5/+80
|\ \
| * | Enable the performance bar in dev environmentsZeger-Jan van de Weg2017-12-131-0/+1
| * | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-121-0/+11
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| * | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-082-4/+15
| |/
| * Support uploads for groupsJarka Kadlecova2017-12-071-0/+23
| * Resolve "Display member role per project"Mike Greiling2017-12-071-0/+23
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-303-2/+3
|\ \ | |/
| * Minor backport from EEbackport_from_eeValery Sizov2017-11-291-1/+1
| * Create issue and merge request destroy servicesGeorge Andrinopoulos2017-11-251-1/+1
| * Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-231-1/+1
| |\
| | * Use latest_merge_request_diff associationSean McGivern2017-11-231-1/+1
| * | Fix link text from group contextJarka Kadlecova2017-11-231-0/+1
| |/
* | Fix a few layout errorLin Jen-Shin2017-11-222-2/+1
* | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2214-50/+50
* | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1812-35/+52
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-177-74/+73
|\ \ | |/
| * Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-updateDouwe Maan2017-11-161-3/+7
| * Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-141-9/+1
| |\
View Lorry Controller Status