summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'Ash McKenzie2019-07-232-4/+14
|\ | | | | | | | | CE Port: Log impersonation actions in audit log See merge request gitlab-org/gitlab-ce!31039
| * CE Port: Log impersonation actions in audit logce-port-315-log-impersonation-actions-in-audit-logmanojmj2019-07-232-4/+14
| | | | | | | | | | | | This change adds audit logs for user impersonation when an admin starts/stops impersonating another user.
* | Bring backward compatibility for request profilesKamil Trzciński2019-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | It seems that we missed the backward compatibility support for profiles in the existing folder. This commit also fixes some specs to be idempotent and work in a temporary directory which not always seems to be the case. This commit also brings the profile_spec.rb which seems to be missing.
* | Add review remarksGosia Ksionek2019-07-221-5/+5
| | | | | | | | | | | | Add cr remarks Add cr remarks
* | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-222-2/+4
|\ \ | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | Add subgroup_creation_level to the list of allowed group paramsFabio Papa2019-07-192-2/+4
| | | | | | | | | | | | For both groups_controller and admin/groups_controller
* | | Merge branch '55564-remove-if-in-before-after-action' into 'master'Lin Jen-Shin2019-07-226-12/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove `if:` argument in before_action and alike when `only:` is also used Closes #55564 See merge request gitlab-org/gitlab-ce!24412
| * | Rewrite `if:` argument in before_action and alike when `only:` is also usedGeorge Thomas2019-07-186-12/+15
| | | | | | | | | | | | | | | | | | Closes #55564 This is first discovered in #54739 (comment 122609857) that if both if: and only: are used in a before_action or after_action or alike, if: is completely ignored.
* | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-192-0/+9
| | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* | | Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-181-34/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds chaos endpoints to Sidekiq Closes #64663 See merge request gitlab-org/gitlab-ce!30814
| * | | Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-181-34/+20
| | | | | | | | | | | | | | | | | | | | This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
* | | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-181-4/+4
| |/ / |/| | | | | | | | | | | | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* | | Refactor EnvironmentsController#metrics_dashboard endpointSarah Yasonik2019-07-161-7/+9
| | |
* | | Add result to MoveService#execute_multiplePatrick Derichs2019-07-161-5/+2
|/ / | | | | | | | | | | | | | | It adds a hash response which includes the count, success state and the moved issues itself so the caller has additional information about the result of the process.
* | 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
View Lorry Controller Status