summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Remove auto ssl feature flagsVladimir Shushlin2019-07-121-10/+2
| | | | | * remove feature flag for admin settings * remove feature flag for domain settings
* Upgrade to Rails 5.2upgrade-rails-5-2-ceHeinrich Lee Yu2019-07-122-2/+2
| | | | Updates changed method names and fixes spec failures
* Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-23/+64
|\ | | | | | | | | | | | | Add `db_spin` and refactor ChaosController Closes #64425 See merge request gitlab-org/gitlab-ce!30559
| * Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-111-23/+64
| |
* | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-111-3/+32
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for new endpoint to move multiple issues. Add changelog entry Just check the first issue for the ability to move / update Add specs for exceeding limits and malformed requests Changed name of shared examples Change title of changelog entry Use %i instead of %w Check permission to update issue on project instead of board Use admin_issue permission to check for issue move ability Changed variable name to avoid shadow issue_params method Rename route to bulk_move Change route definition Check permissions for each issue Combine methods for parameters permit check Remove extra context Change description of context Check param for type Array Add unit tests to MoveService Use before_action for permission check Use set instead of let! Use let's instead of set
* Add support for additional panel typesJose Ivan Vargas2019-07-101-0/+1
| | | | | This introduces the single stat chart component aside from the area chart component
* Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'Douglas Barbosa Alexandre2019-07-102-2/+2
|\ | | | | | | | | Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
| * Add cr remarksMałgorzata Ksionek2019-07-092-2/+2
| |
| * Update controllers method callsMałgorzata Ksionek2019-07-092-2/+2
| |
* | Remove `:graphql` feature flagcharlie ablett2019-07-092-11/+0
| | | | | | | | | | | | | | | | - Remove `FeatureConstrainer` call wrapping api endpoint - Remove `Feature.enabled?(:graphql)` conditionals in back and frontend - Modify graphql test to be graphql flag agnostic - Remove api routing spec - Remove frontend feature flag via `gon`
* | CE Port of Allow bulk update for group issuesFatih Acet2019-07-091-2/+2
|/ | | | | | | | This is a port MR for CE Original MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14141
* Extract deployment_metrics into own objectThong Kuah2019-07-081-6/+8
| | | | | | | We can now share project so that we don't have to load project twice. Also, this extracts non-relevant logic out of Deployment. Update DeploymentsController accordingly
* Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-052-2/+2
|\ | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * Create private merge requests in forksPhil Hughes2019-07-052-2/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | Merge branch '54117-transactional-rebase' into 'master'Douglas Barbosa Alexandre2019-07-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Allow asynchronous rebase operations to be monitored Closes #54117 See merge request gitlab-org/gitlab-ce!29940
| * | Allow asynchronous rebase operations to be monitoredNick Thomas2019-07-041-1/+1
| |/ | | | | | | | | | | | | | | | | This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
* | Change 'Todo' to 'To Do'Christie Lenneville2019-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* | Set default project sort method prior to initial sort on page loadingDavid Palubin2019-07-041-1/+1
|/
* Merge branch 'sh-fix-issue-63349' into 'master'Rémy Coutable2019-07-041-1/+1
|\ | | | | | | | | | | | | Make Housekeeping button do a full garbage collection Closes #63349 See merge request gitlab-org/gitlab-ce!30289
| * Make Housekeeping button do a full garbage collectionsh-fix-issue-63349Stan Hu2019-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the Housekeeping button and API would use the counter of last pushes to determine whether to do a full garbage collection, or whether to do one of the less comprehensive tasks: a full repack, incremental pack, or ref pack. This was confusing behavior, since a project owner might have to click the button dozens of times before a full GC would be initiated. This commit forces a full GC each time this is initiated. Note that the `ExclusiveLease` in `HousekeepingService` prevents users from clicking on the button more than once a day. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63349
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-0311-30/+63
|\ \ | |/
| * Add username to deploy tokensKrasimir Angelov2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
| * Registry component now includes error messagesNick Kipling2019-07-021-0/+2
| | | | | | | | | | | | | | | | | | Includes changes to the Vue container registry component to support the display of an empty message and error message when invalid characters are found in the group, project or branch name. repositories/index.html.haml has been changed to remove the content and place into Vue component.
| * Fix broken specs due to cached application settingsStan Hu2019-07-011-1/+1
| | | | | | | | | | | | The /admin panel will now always return an uncached application setting to ensure it always has the most current info.
| * Merge branch '82-add-new-onboarding-to-flipper-a-b-testing' into 'master'Nick Thomas2019-07-011-0/+1
| |\ | | | | | | | | | | | | Add new onboarding to flipper A/B testing See merge request gitlab-org/gitlab-ce!30125
| | * Add A/B testing support to onboarding82-add-new-onboarding-to-flipper-a-b-testingAsh McKenzie2019-06-281-0/+1
| | | | | | | | | | | | | | | Check if we're gitlab.com and the :user_onboarding feature flag is enabled.
| * | Revert "Include subgroups in shared_projects"Fabian Schneider2019-07-011-2/+1
| | | | | | | | | | | | This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
| * | Merge branch '58583-confidential-mr-branch-backend' into 'master'Rémy Coutable2019-07-012-2/+15
| |\ \ | | | | | | | | | | | | | | | | Support creating an MR/branch on a fork from an issue See merge request gitlab-org/gitlab-ce!29831
| | * | Check if user can `update_issue` on projectPatrick Bajao2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | If user can update an issue under the specified confidential issue project, should be able to find the project.
| | * | Fix issues when creating system notes58583-confidential-mr-branch-backendPatrick Bajao2019-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `confidential_issue_project_id` is set and the issue is under that project, create the a note about branch creation in that project. If not, do nothing. When creating `new_merge_request` system note, set the project where the MR will be referenced from so it'll be linked to when the MR is created in another project.
| | * | Support branch creation from confidential issuePatrick Bajao2019-06-291-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept a `confidential_issue_project_id` param which will be used for the system note target. This also includes some refactoring on the spec to use shared examples.
| | * | Support creating an MR on a fork from an issuePatrick Bajao2019-06-291-0/+1
| | | |
| * | | Merge branch 'id-stale-branches' into 'master'Grzegorz Bizon2019-07-011-9/+13
| |\ \ \ | | |/ / | |/| | | | | | | | | | Add endpoint for fetching diverging commit counts See merge request gitlab-org/gitlab-ce!29802
| | * | Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-9/+13
| | | | | | | | | | | | | | | | Extract diverging_commit_counts into a service class
| * | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-283-6/+29
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
| | * | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-283-6/+29
| | |/ | | | | | | | | | | | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
| * | Remove group_clusters feature flagThong Kuah2019-06-281-9/+0
| | | | | | | | | | | | | | | | | | Now we have terminals for instance and group clusters we can remove the FF now. Deploying to group clusters has been working without complaints too.
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2019-07-039-20/+54
|\ \ \ | |/ / |/| |
| * | Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'Marin Jankovski2019-07-022-5/+17
| |\ \ | | | | | | | | | | | | | | | | Persist tmp snippet uploads at users See merge request gitlab/gitlabhq!3138
| | * | Persist tmp snippet uploadsOswaldo Ferreira2019-06-172-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It persist temporary personal snippets under user/:id namespaces temporarily while creating a upload record to track it. If an user gets removed while it's still a tmp upload, it also gets removed. If the tmp upload is sent, the upload gets moved to personal_snippets/:id as before. The upload record also gets updated to the new model type as well.
| * | | Merge branch 'security-notes-in-private-snippets' into 'master'Marin Jankovski2019-07-022-9/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Ability to write a note in a private snippet See merge request gitlab/gitlabhq!3133
| | * | | Correctly check permissions when creating snippet notesMarkus Koller2019-06-062-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Snippets::NotesController the noteable was resolved and authorized through the :snippet_id, so by passing a :target_id for a different snippet it was possible to create a note on a snippet where the user would be unauthorized to do so otherwise. This fixes the problem by ignoring the :target_id and :target_type from the request, and using the same noteable for creation and authorization.
| * | | | Merge branch 'security-59581-related-merge-requests-count' into 'master'Marin Jankovski2019-07-023-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose merge requests count based on user access See merge request gitlab/gitlabhq!3157
| | * | | | Expose merge requests count based on user accessAlexandru Croitor2019-06-183-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count issues related merge requests based on user access level. And issue can have related MRs from projects where user does not have access so the number of related merge requests should be adjusted based on user's ability to access the related MRs. https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
| * | | | | Merge branch 'security-prevent-detection-of-merge-request-template-name' ↵Marin Jankovski2019-07-022-2/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Guests can know whether merge request template name exists or not See merge request gitlab/gitlabhq!3117
| | * | | | | Authorize access before serving project templateLuke Duncalfe2019-06-112-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a user was a guest member of a private project, they could access the merge request template as we were not checking permission-levels of the user. When a issue template is asked for, the user must have :read_issue for the project; or :read_merge_request when a merge request template is asked for. We also now rescue_from FileNotFoundError and handle as 404. This is because RepoTemplateFinder can raise a FileNotFoundError exception, which Rails previously handled as a 500. Handling these in a way that is consistent with ActiveRecord::RecordNotFound exceptions, within controllers that inherit from Projects::ApplicationController at least, and returning a 404. https://gitlab.com/gitlab-org/gitlab-ce/issues/54943
* | | | | | | Merge branch 'sh-add-gitaly-ref-caching-search-controller' into 'master'Kamil Trzciński2019-06-273-6/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly ref caching for SearchController See merge request gitlab-org/gitlab-ce!30105
| * | | | | | | Enable Gitaly ref caching for SearchControllersh-add-gitaly-ref-caching-search-controllerStan Hu2019-06-263-6/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we noticed in https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742, clicking on the "Issues" tab often requests the same reference in rendering Markdown.
* | | | | | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-273-2/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | | | | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-263-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE