summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-121-0/+21
|\ | | | | | | | | | | | | Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
| * 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
|/ | | | | | | | | | | | | | | | | | | This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
* [Rails5] Add `raise: false` to skip_before_action in ↵blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concernblackst0ne2018-04-061-1/+1
| | | | | | | | authenticates_with_two_factor.rb Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped. https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd This commit adds `raise: false` to the filter.
* [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 push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| | * 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
| | | | | | | | | | | | | | | Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
| * | Bring one group board to CEFelipe Artur2018-03-031-2/+42
| | |
| * | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-021-1/+1
| |/ | | | | | | | | | | | | | | | | In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
| * 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
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Move the #update action from Project/Member controllers to the ↵Rémy Coutable2018-02-271-0/+12
| | | | | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-271-4/+9
| | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-081-5/+13
| | | | | | | | | | | | | | File uploads on objects storage should use hashed storage Closes #4952 See merge request gitlab-org/gitlab-ee!4597
* | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backportKamil Trzciński2018-02-286-8/+48
|\ \ | |/ | | | | object-storage-ee-to-ce-backport
| * Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-232-2/+30
| |\ | | | | | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| | * 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 URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
| | * 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
| |/ | | | | | | | | | | | | | | | | By extracting a new `filter_items` method, we can override that in the IssuesFinder and MergeRequestsFinder separately, so we don't need checks that the model is the correct one, because we can just use the class we're in to know that. We can do the same for the VALID_PARAMS constant, by making it a class method.
* | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński2018-02-285-9/+10
|\ \ | |/ | | | | object-storage-ee-to-ce-backport
| * Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-071-0/+1
| |\ | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| | * Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-064-17/+55
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| | * \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-311-5/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| | * \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-293-5/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-174-3/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| | * | | | | Manual Configuration instead of Activation. Prometheus Service just got a ↵Pawel Chojnacki2018-01-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bit weirder
| * | | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
| | * | | | | add the uploader context to the upload modelMicaël Bergeron2018-02-021-1/+1
| | | | | | |
| * | | | | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-022-6/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | including/extending it
* | | | | | 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
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
| * | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-11/+50
| | | | | |
| * | | | | Merge branch '30106-group-issues' into 'master'Sean McGivern2018-02-011-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | View all issues of all subgroups on the group issue page Closes #30106 and #39388 See merge request gitlab-org/gitlab-ce!16706
| | * | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281
| * | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | When searching we would limit the scope of ancestors to load because the filter would be applied to the ancestors. Instead, we need to load _all_ ancestors for matching projects.
| * | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
| * | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-3/+12
| | |/ | |/| | | | | | | | | | | | | The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
* | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński2018-02-2819-51/+116
|\ \ \ | |/ / | | | | | | object-storage-ee-to-ce-backport
| * | Improve filtering issues by label performanceissue_40500Felipe Artur2018-01-052-3/+0
| |/