summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon2018-06-071-6/+1
|\
| * Force Postgres to avoid trigram indexes when in a groupSean McGivern2018-06-071-0/+1
| * Simplify issuable finder queriesSean McGivern2018-06-061-6/+0
* | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-1/+6
|\ \
| * | simplify uploader versions checkAlexis Reigel2018-06-051-9/+4
| * | require uploaded file's name to match in any caseAlexis Reigel2018-06-051-1/+5
| * | ability to get an image's alternative versionAlexis Reigel2018-06-051-1/+7
| * | allow uploading favicon in appearance settingsAlexis Reigel2018-06-051-1/+1
| |/
* | Backport of 5942-extract-ee-specific-filesccr/extract_EE_code_5942Chantal Rollison2018-06-011-13/+17
|/
* Export assigned issues in iCalendar feedImre Farkas2018-05-311-1/+14
* Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-171-0/+15
* Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu2018-05-131-0/+4
* Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-071-1/+0
|\
| * Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-031-1/+0
* | Reuses `InternalRedirect` when possibleBob Van Landuyt2018-05-041-2/+2
* | Enforces terms in the web applicationBob Van Landuyt2018-05-041-0/+35
* | [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-281-1/+1
* | Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-241-2/+2
* | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-221-0/+3
|/
* Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-181-2/+2
* Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-161-0/+4
|\
| * embedded snippets supporthaseeb2018-02-281-0/+4
* | 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
| |\
View Lorry Controller Status