summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Send notifications to group-specific email addressWei-Meng Lee2019-05-311-0/+24
| | | | | | - Select notification email by walking up group/subgroup path - Add settings UI to set group email notification address - Add tests
* Merge branch 'bvl-phabricator-import-issues' into 'master'Phil Hughes2019-05-312-1/+40
|\ | | | | | | | | | | | | Setup Phabricator import Closes #60562 See merge request gitlab-org/gitlab-ce!27877
| * Setup Phabricator importBob Van Landuyt2019-05-312-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up all the basics for importing Phabricator tasks into GitLab issues. To import all tasks from a Phabricator instance into GitLab, we'll import all of them into a new project that will have its repository disabled. The import is hooked into a regular ProjectImport setup, but similar to the GitHub parallel importer takes care of all the imports itself. In this iteration, we're importing each page of tasks in a separate sidekiq job. The first thing we do when requesting a new page of tasks is schedule the next page to be imported. But to avoid deadlocks, we only allow a single job per worker type to run at the same time. For now we're only importing basic Issue information, this should be extended to richer information.
* | Merge branch 'i18n-Two_Factor_Authentication-of-user-profile' into 'master'Bob Van Landuyt2019-05-312-4/+4
|\ \ | | | | | | | | | | | | Externalize strings of Two-Factor Authentication page in user profile See merge request gitlab-org/gitlab-ce!28749
| * | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-312-4/+4
| |/
* | Merge branch 'i18n-password-of-user-profile' into 'master'Bob Van Landuyt2019-05-311-5/+5
|\ \ | |/ |/| | | | | Externalize strings of password page in user profile See merge request gitlab-org/gitlab-ce!28744
| * Externalize strings of password page in user profileantonyliu2019-05-291-5/+5
| |
* | Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standardsSean McGivern2019-05-301-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Support sorting issues using `relative_position` Closes #62178 See merge request gitlab-org/gitlab-ce!28566
| * | 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
* | | Merge branch 'graphql-batch-requests-ee' into 'master'Filipa Lacerda2019-05-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Enable GraphQL batch requests See merge request gitlab-org/gitlab-ce!28370
| * | | Enable GraphQL batch requestsPhil Hughes2019-05-291-1/+2
| | |/ | |/|
* | | Redirect to admin projects index if project was deleted from admin pageLuke Picciau2019-05-291-1/+10
|/ /
* | Externalize strings of notifications page in user profileantony liu2019-05-281-2/+2
|/
* Enables GraphQL batch requestsPhil Hughes2019-05-281-7/+39
| | | | | | | | | Enabling GraphQL batch requests allows for multiple queries to be sent in 1 request reducing the amount of requests we send to the server. Responses come come back in the same order as the queries were provided.
* Add Kubernetes logs to monitoring UITiger2019-05-271-1/+2
|
* #61441 Allow user to set email ID before setting up 2FAKartikey Tanna2019-05-221-1/+1
|
* Require time window params in metrics dashboardSarah Yasonik2019-05-201-1/+0
|
* Merge branch 'reg-captcha-flag' into 'master'Nick Thomas2019-05-161-9/+16
|\ | | | | | | | | | | | | Add :registrations_recaptcha feature flag Closes gitlab-ee#11389 See merge request gitlab-org/gitlab-ce!28296
| * Add :registrations_recaptcha feature flagLuke Bennett2019-05-161-9/+16
| | | | | | | | | | | | | | Allows instance owners to toggle the recaptcha requirement on the user registration page by feature flag. Allows GitLab Growth team to measure reCAPTCHA's impact on registrations.
* | Add Let's Encrypt clientVladimir Shushlin2019-05-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
* | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable2019-05-156-21/+24
|\ \ | | | | | | | | | | | | Refactor RoutableActions to allow additional not_found checks See merge request gitlab-org/gitlab-ce!28243
| * | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-156-21/+18
| | | | | | | | | | | | | | | 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
| |/
* | Optimise upload path callsSean McGivern2019-05-141-1/+1
|/ | | | | | | | String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).
* i18n: externalize strings from user profile settingsantony liu2019-05-091-3/+3
|
* Added user time settings fields to profileEzekiel Kigbo2019-05-072-1/+4
| | | | | | Udpated user_edit_profile_spec with time preferences Minor update form fields
* Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'Robert Speicher2019-05-071-1/+6
|\ | | | | | | | | CE changes for SSO web enforcement See merge request gitlab-org/gitlab-ce!28141
| * CE changes for SSO web enforcementce-jej/group-saml-sso-enforcementJames Edwards-Jones2019-05-061-1/+6
| | | | | | | | | | | | Adds two methods for us to extend in EE: - OmniauthCallbacksController#link_identity - GroupPolicy#lookup_access_level!
* | Add external dashboard linkAdriel Santiago2019-05-072-0/+5
| | | | | | | | | | Add settings for linking to external dashboard from metrics dashboard
* | Check instance cluster feature at policy levelJames Fargher2019-05-074-19/+25
| | | | | | | | Try to simplify feature flag checks by using policies
* | Allow projects to use instance level clustersJames Fargher2019-05-071-2/+10
| | | | | | | | | | | | There are two cluster hierarchies one for the deployment platform and one for controllers. The main difference is that deployment platforms do not check user permissions and only return the first match.
* | Instance level kubernetes clusters adminJames Fargher2019-05-072-0/+26
| | | | | | | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* | Destroy repo mirrors instead of disabling themLuke Bennett2019-05-061-0/+1
| | | | | | | | | | | | | | | | It is important to destroy data related to repo mirrors when they are disabled. Use `_destroy` nested attribute instead of `enabled` for push mirrors. Call `remove_import_data` after saving a project if its pull mirror is disabled.
* | Implement support for CI variables of type fileKrasimir Angelov2019-05-064-4/+4
| | | | | | | | | | | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* | Merge branch 'jej/session-stored-globaly' into 'master'Dmitriy Zaporozhets2019-05-061-0/+5
|\ \ | |/ |/| | | | | Session stored globally per request See merge request gitlab-org/gitlab-ce!27658
| * Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-021-0/+5
| | | | | | | | | | - This can be accessed with Session.current and is restored after. - Data can be stored under a key with NamespacedSessionStore
* | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-052-3/+3
| |
* | Add gitlab-managed option to clusters formMayra Cabrera2019-05-031-0/+2
| | | | | | | | | | | | | | | | When this option is enabled, GitLab will create namespaces and service accounts as usual. When disabled, GitLab wont create any project specific kubernetes resources Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* | Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-021-0/+25
| | | | | | | | | | | | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* | Remove the `comment_personal_snippet` permissionremove-comment-personal-snippet-permissionSean McGivern2019-05-021-2/+3
| | | | | | | | | | | | | | | | | | This is now entirely handled by `create_note`: 1. Project snippets prevent `create_note`. 2. Uploads already only support routing for personal snippets. This simplifies some policies and access checks, too!
* | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-011-4/+22
| | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* | Merge branch 'group-project-template-in-paid-features' into 'master'Michael Kozono2019-04-301-3/+3
|\ \ | | | | | | | | | | | | Group project templates should be a Silver/Premium feature - CE backport See merge request gitlab-org/gitlab-ce!27407
| * | Update projects controllergroup-project-template-in-paid-featuresMałgorzata Ksionek2019-04-161-3/+3
| | |
* | | DELETE clusters/:id/:application endpointThong Kuah2019-04-291-0/+13
| | | | | | | | | | | | Add endpoint to delete/uninstall a cluster application
* | | Merge branch ↵Ash McKenzie2019-04-301-12/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
| * | | Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varianFatih Acet2019-04-151-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
* | | | Load environment metrics only for JSON endpointPeter Leitzen2019-04-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing the HTML version of the environment metrics we don't need to fetch their metrics because we don't use them anymore on the HTML version. We use additional_metrics.json endpoint now.
* | | | Merge branch '60383-setup-dashboard-endpoint' into 'master'Grzegorz Bizon2019-04-281-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create dashboards endpoint & setup dashboard post-processing Closes #60383 See merge request gitlab-org/gitlab-ce!27405
| * | | | Move MetricsDashboard to Metrics::Dashboardsyasonik2019-04-251-1/+1
| | | | |
| * | | | Rubocopsyasonik2019-04-241-0/+1
| | | | |