summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Collapse)AuthorAgeFilesLines
* Support redirect paths starting with a dash51952-forking-via-webideMarkus Koller2019-06-251-2/+2
| | | | | | | We use a leading dash for certain things like the WebIDE, which had the side effect of losing the `params[:continue][:to]` param when opening the WebIDE on a project where the user doesn't have push access and therefore needs to fork the project first.
* Make checks for continue_params more robustMarkus Koller2019-06-251-1/+1
| | | | | | | | | | The check for continue_params&.key?(:to) in Projects::ImportsController caused an exception in redirect_to if this key contained a nil value. Since url_for won't add any params for an empty hash, we can just return that in continue_params if params[:continue] isn't present, and simplify the code in the controllers to check for the values we actually want to use.
* #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-181-1/+2
| | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* Search issuables by iidsRiccardo Padovani2019-06-181-0/+6
|
* Add `to_json` to `represent` method callce-3861-use-serializers-for-project-group-boardscharlieablett2019-06-131-1/+1
|
* Add `to_json` to `represent` method callcharlieablett2019-06-101-1/+1
|
* Use serialization for project boardscharlieablett2019-06-062-1/+13
| | | | | | - Add serializers and Grape::Entity - Replace to_json - Add specs
* Fix project settings not being able to updateStan Hu2019-06-031-0/+2
| | | | | | | | Previously import_url would always be present in the update parameters, which would cause the validation to fail. We now only include this parameter only if there is URL given. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62708
* Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-032-1/+24
|\
| * Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'GitLab Release Tools Bot2019-06-031-0/+17
| |\ | | | | | | | | | | | | Handling password on import by url page See merge request gitlab/gitlabhq!3061
| | * Hide password on import by url formIgor Drozdov2019-05-291-0/+17
| | |
| * | Merge branch 'security-fix-confidential-issue-label-visibility-master' into ↵GitLab Release Tools Bot2019-06-031-1/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | 'master' Fix confidential issue label disclosure on milestone view See merge request gitlab/gitlabhq!3098
| | * Fix confidential issue label disclosure on milestone viewPatrick Derichs2019-05-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Method should be public Use milestonish method Use render data to filter labels Add specs for label visibility on milestone
* | | Allow issues to be sorted by relative_positionBrett Walker2019-05-281-0/+6
|/ / | | | | | | | | - adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
* | #61441 Allow user to set email ID before setting up 2FAKartikey Tanna2019-05-221-1/+1
| |
* | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-152-11/+15
| | | | | | | | | | Since this needs to be called on every find_routable!(Project, ... we can instead move it to a RoutableActions check.
* | Refactor RoutableActions to allow for additional checksJames Edwards-Jones2019-05-151-3/+9
|/
* Check instance cluster feature at policy levelJames Fargher2019-05-071-0/+19
| | | | Try to simplify feature flag checks by using policies
* Remove "You are already signed in" bannerIllya Klymov2019-04-241-7/+0
|
* Move scoped_label into label presenterJan Provaznik2019-04-231-1/+1
| | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-091-4/+15
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-082-11/+6
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-051-15/+4
| | | This reverts merge request !26823
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-051-4/+15
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Merge branch 'keyval-labels' into 'master'Sean McGivern2019-04-051-0/+3
|\ | | | | | | | | [CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
| * [backend] backport of scoped labelsJan Provaznik2019-04-041-0/+3
| | | | | | | | Scoped labels in EE require additional changes in CE code.
* | Merge branch 'extend-cte-optimisations-to-projects' into 'master'Dmitriy Zaporozhets2019-04-051-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Extend CTE search optimisation to projects Closes #55170 See merge request gitlab-org/gitlab-ce!26908
| * | Extend CTE search optimisation to projectsextend-cte-optimisations-to-projectsSean McGivern2019-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use the `search` param on an `IssuableFinder`, we can run into issues. We have trigram indexes to support these searches. On GitLab.com, we often see Postgres's optimiser prioritise the (global) trigram indexes over the index on `project_id`. For group and project searches, we know that it will be quicker to filter by `project_id` first, as it returns fewer rows in most cases. For group issues search, we ran into this issue previously, and went through the following iterations: 1. Use a CTE on the project IDs as an optimisation fence. This prevents the planner from disregarding the index on `project_id`. Unfortunately it breaks some types of sorting, like priority and popularity, as they sort on a joined table. 2. Use a subquery for listing issues, and a CTE for counts. The subquery - in the case of group lists - didn't help as much as the CTE, but was faster than not including it. We can safely use a CTE for counts as they don't have sorting. Now, however, we're seeing the same issue in a project context. The subquery doesn't help at all there (it would only return one row, after all). In an attempt to keep total code complexity under control, this commit removes the subquery optimisation and applies the CTE optimisation only for sorts we know that are safe. This means that for more complicated sorts (like priority and popularity), the search will continue to be very slow. If this is a high-priority issue, we can consider introducing further optimisations, but this finder is already very complicated and additional complexity has a cost. The group CTE optimisation is controlled by the same feature flag as before, `attempt_group_search_optimizations`, which is enabled by default. The new project CTE optimisation is controlled by a new feature flag, `attempt_project_search_optimizations`, which is disabled by default.
* | | Fixed test specsOswaldo Ferreira2019-04-041-1/+1
| |/ |/| | | | | | | - added suggestions to mock data - fixed props to be not required
* | Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-031-3/+0
|/ | | | Also removes specs related to the flag
* Externalize strings in projects controllersMartin Wortschack2019-03-276-29/+53
| | | | | | | - concerns - dashboard - groups - import
* Merge branch 'security-2826-fix-project-serialization-in-quick-actions' into ↵Alex Hanselka2019-03-201-1/+1
|\ | | | | | | | | | | | | | | | | 'master' Fix project serialization in quick actions response Closes #2826 See merge request gitlab/gitlabhq!3001
| * Only return `commands_changes` used in frontendHeinrich Lee Yu2019-03-181-1/+1
| | | | | | | | | | When executing quick actions, this limits the `commands_changes` response to only those used by the frontend
* | Remove redirecting to last visited boardHeinrich Lee Yu2019-03-131-16/+0
| | | | | | | | Move this to EE-only. It isn't useful here since there's only one board
* | Refactor groups and projects boards actionsHeinrich Lee Yu2019-03-131-0/+54
|/ | | | Move common functionality to BoardsActions concern
* Merge branch 'winh-enable-reply_to_individual_notes' into 'master'Grzegorz Bizon2019-03-071-1/+1
|\ | | | | | | | | | | | | Enable reply_to_individual_notes feature flag by default Closes #30299 See merge request gitlab-org/gitlab-ce!25575
| * Enable reply_to_individual_notes feature flag by defaultWinnie Hellmann2019-03-061-1/+1
| |
* | Adds the Rubocop ReturnNil copAndrew Newdigate2019-03-062-2/+2
|/ | | | | This style change enforces `return if ...` instead of `return nil if ...` to save maintainers a few minor review points
* Merge branch 'security-2797-milestone-mrs' into 'master'Yorick Peterse2019-03-041-1/+1
|\ | | | | | | | | Show only MRs visible to user on milestone detail See merge request gitlab/gitlabhq!2895
| * Show only MRs visible to user on milestone detailJarka Košanová2019-02-141-1/+1
| |
* | Merge branch 'fix-misspellings-app-comments' into 'master'Rémy Coutable2019-02-261-1/+1
| | | | | | | | | | Fix misspellings in app/spec comments See merge request gitlab-org/gitlab-ce!25517
* | Merge branch 'filter-confidential-issues' into 'master'Kamil Trzciński2019-02-261-0/+1
| | | | | | | | | | | | | | Ability to filter confidential issues Closes #50747 See merge request gitlab-org/gitlab-ce!24960
* | Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"Michael Kozono2019-02-251-1/+1
| | | | | | | | | | This reverts commit 9202bbd129537a698b986e6295d0c783b5a84815, reversing changes made to 4b282e9ce1ae246c4538b3ede18d1380ea778029.
* | Revert "Merge branch 'filter-confidential-issues' into 'master'"Michael Kozono2019-02-251-1/+0
| | | | | | | | | | This reverts commit d133bf84c668df3dfc9938bb04150754cb873c8b, reversing changes made to 7981c0292b07a0138b096fa082341fcb13e9ce2b.
* | Merge branch 'filter-confidential-issues' into 'master'Kamil Trzciński2019-02-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Ability to filter confidential issues Closes #50747 See merge request gitlab-org/gitlab-ce!24960
| * | Only use boolean parameters internallyRobert Schilling2019-02-221-1/+1
| | | | | | | | | | | | Use internally only boolean params.
| * | Ability to filter confidential issuesRobert Schilling2019-02-211-0/+1
| |/ | | | | | | | | Add a new search bar filter for confidential issues. Add filtering support to the IssuesFinder.
* | Fix misspellings in app/spec commentsTakuya Noguchi2019-02-251-1/+1
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Refactor params for notes_actionsHeinrich Lee Yu2019-02-231-30/+27
|/ | | | | | | Removes unneeded params from permitted list This also fixes commenting on commits with a hash starting with a large number
* Fix Content-Disposition hard-coded to attachmentsStan Hu2019-02-131-1/+1
| | | | | | | | | Due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24919, Content-Disposition is hard-coded to `attachment` instead of `inline`. We now use the argument `disposition` to fix that problem. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57660