summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-121-0/+21
|\
| * Share collaboration check between view and presenterBob Van Landuyt2018-04-111-0/+21
* | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-112-3/+3
|/
* [Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_f...blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concernblackst0ne2018-04-061-1/+1
* [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-041-1/+1
* Refactor discussions/notes codeJan Provaznik2018-04-032-2/+6
* fix the failing specsMicaël Bergeron2018-03-221-1/+2
* Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-092-10/+10
* Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-087-19/+128
|\
| * Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-071-2/+6
| |\
| | * Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-2/+6
| * | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+1
| |\ \ | | |/ | |/|
| | * Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+1
| * | Bring one group board to CEFelipe Artur2018-03-031-2/+42
| * | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-021-1/+1
| |/
| * 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 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-081-5/+13
* | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-286-8/+48
|\ \ | |/
| * 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 commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-285-9/+10
|\ \ | |/
| * 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
| |/ / / / /
* | | | | | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-285-10/+36
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-281-50/+11
| |/ / / / /
| * | | | | 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
* | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-281-11/+50
* | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2819-51/+116
|\ \ \ | |/ /
| * | Improve filtering issues by label performanceissue_40500Felipe Artur2018-01-052-3/+0
| |/
View Lorry Controller Status