summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-111-0/+15
|\ | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-101-0/+1
| |
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+14
| | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | Disable method instrumentation for diffsStan Hu2019-04-101-1/+0
| | | | | | | | | | | | | | | | | | When there a large number of discussions on diffs, the instrumentation has a significant impact on performance since it's often run in a tight loop for line position calculation etc. We should disable this since there are other ways to benchmark performance. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52898
* | Add doc link to omnibus for changing gitlab.ymlDmitriy Zaporozhets2019-04-101-1/+2
|/
* Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-091-1/+2
|\ | | | | | | | | Fix the bug that the project statistics is not updated See merge request gitlab-org/gitlab-ce!26854
| * Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-051-1/+2
| |
* | Add Knative metrics to PrometheusChris Baumbauer2019-04-062-1/+15
| |
* | Merge branch 'winh-ee-environment-variable' into 'master'Mike Greiling2019-04-052-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Rename environment variable EE to IS_GITLAB_EE Closes #60080 See merge request gitlab-org/gitlab-ce!27044
| * | Rename environment variable EE to IS_GITLAB_EEwinh-ee-environment-variableWinnie Hellmann2019-04-052-3/+3
| |/
* | Add part of needed codeGosia Ksionek2019-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | Add a Prometheus API per environmentrpereira22019-04-051-0/+2
|/ | | | | | The api will proxy requests to the environment's prometheus server. The Prometheus::ProxyService class can be reused when we add support for group prometheus servers.
* Merge branch '54417-graphql-type-authorization' into 'master'Nick Thomas2019-04-041-0/+3
|\ | | | | | | | | | | | | GraphQL Type authorization Closes #54417 See merge request gitlab-org/gitlab-ce!25724
| * GraphQL Type authorizationLuke Duncalfe2019-04-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables authorizations to be defined on GraphQL Types. module Types class ProjectType < BaseObject authorize :read_project end end If a field has authorizations defined on it, and the return type of the field also has authorizations defined on it. then all of the combined permissions in the authorizations will be checked and must pass. Connection fields are checked by "digging" to find the type class of the "node" field in the expected location of edges->node. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54417
* | Prevent premailer from converting HTML entitiesHeinrich Lee Yu2019-04-041-1/+2
|/ | | | This prevents `&mdash` in our templates being change to `-`
* Load 'Gitlab::Jira::Middleware' if it existsFelipe Artur2019-04-011-0/+11
| | | | | Loads 'Gitlab::Jira::Middleware' only if it exists so this initializer can be backported to CE.
* Extract IS_EE config helperWinnie Hellmann2019-03-282-5/+10
|
* Merge branch '54670-external-diffs-when-outdated' into 'master'Sean McGivern2019-03-283-0/+14
|\ | | | | | | | | | | | | Allow external diffs to be used conditionally Closes #54670 See merge request gitlab-org/gitlab-ce!25432
| * Allow external diffs to be used conditionallyNick Thomas2019-03-273-0/+14
| | | | | | | | | | | | | | | | | | | | Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions.
* | Log Gitaly RPC duration to api_json.log and production_json.logStan Hu2019-03-271-1/+6
|/ | | | | | | This makes it easier to debug Gitaly performance issues in the field. This commit also makes the tracking of query time thread-safe via RequestStore.
* Merge branch 'winh-remove-sushi' into 'master'Winnie Hellmann2019-03-261-1/+1
| | | | | | | | | | Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430 (cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
* Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-221-1/+1
| | | This reverts merge request !26430
* Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'Stan Hu2019-03-221-1/+1
|\ | | | | | | | | Display the database adapter name in a human-friendly way See merge request gitlab-org/gitlab-ce!26437
| * Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-211-1/+1
| |
* | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
|/ | | | | | | There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body"
* Merge branch 'send-columns-to-sentry-on-missingattributeerror' into 'master'Stan Hu2019-03-191-0/+15
|\ | | | | | | | | Send schema cache to Sentry on MissingAttributeError See merge request gitlab-org/gitlab-ce!26331
| * Send schema cache to Sentry on MissingAttributeErrorSean McGivern2019-03-191-0/+15
| | | | | | | | | | | | We don't know why this happens, so this is an attempt to debug the issue by sending a full list of all columns ActiveRecord knows about when the error is raised.
* | Integrate Gitlab::Keys with Gitlab::ShellPatrick Bajao2019-03-192-0/+3
|/ | | | | | | | | | | In this commit, some methods that aren't being used are removed from `Gitlab::Shell`. They are the ff: - `#remove_keys_not_found_in_db` - `#batch_read_key_ids` - `#list_key_ids` The corresponding methods in `Gitlab::Keys` have been removed as well.
* Resolve differences in Karma config between CE and EEWinnie Hellmann2019-03-141-15/+19
|
* Security Dashboard as default view for groupsGilbert Roulot2019-03-141-0/+1
| | | | | | | Add a supporting code to separate groups#show and groups#details which is required for the proper implementation of the Group Overview content and Security Dashboard option for it
* Move EE-specifics of Karma test bundle behind flagWinnie Hellmann2019-03-131-0/+4
|
* Merge branch 'winh-ignore-karma-404' into 'master'Mike Greiling2019-03-131-0/+22
|\ | | | | | | | | Hide 404 errors in Karma locally See merge request gitlab-org/gitlab-ce!26073
| * Hide 404 errors in Karma locallyWinnie Hellmann2019-03-131-0/+22
| |
* | Merge branch 'update-rubocop' into 'master'Stan Hu2019-03-131-4/+2
|\ \ | | | | | | | | | | | | Update rubocop target ruby version See merge request gitlab-org/gitlab-ce!24804
| * | Run rubocop -aNick Thomas2019-03-131-4/+2
| | |
* | | Resolve differences in Webpack config between CE and EEWinnie Hellmann2019-03-131-13/+39
|/ /
* | Filter Jira shared secret from logsHeinrich Lee Yu2019-03-131-0/+2
| |
* | Enable/disable Auto DevOps at Group levelMayra Cabrera2019-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Includes instance methods on Group model to detect when a group has AutoDevOps explicitly/implicitly enabled/disabled. - Includes migration to add a new column to namespaces table - Add UI necessary modifications - Add service and controller to update auto devops related instances - Updates project and groups auto devops badges Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52447
* | Batch insert CI rspec_profiling dataStan Hu2019-03-121-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of inserting a row after each example to an external database, we save the CI profiling reports into the `rspec_profiling` directory and insert the data in the update-tests-metadata CI stage. This should make each spec run faster and also reduce the number of PostgreSQL connections needed by concurrent CI builds. `scripts/insert-rspec-profiling-data` also inserts one file at a time via the PostgreSQL COPY command for faster inserts. The one side effect is that the `created_at` and `updated_at` timestamps aren't available since they aren't generated in the CSV. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
* | Merge branch 'mg-remove-node6-support' into 'master'Clement Ho2019-03-112-8/+8
|\ \ | | | | | | | | | | | | Remove node 6 config See merge request gitlab-org/gitlab-ce!25933
| * | Remove node 6 trailing comma supportMike Greiling2019-03-112-8/+8
| | | | | | | | | | | | | | | This removes trailing commas from node scripts which previously omitted them for compatiblity with node 6
* | | Make the Default Reporter `mocha` For KarmaAndrew Fontaine2019-03-111-2/+2
| |/ |/| | | | | | | The `mocha` reporter provides a lot of detail about which tests that fail and why.
* | Filter merge requests by target branchHiroyuki Sato2019-03-091-0/+1
|/
* Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
|
* Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-071-0/+1
|\ | | | | | | | | | | | | Edit Knative domain after it has been deployed Closes #56937 See merge request gitlab-org/gitlab-ce!25386
| * Creates Clusterss::ApplciationsController update endpointJoão Cunha2019-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Creates new route - Creates new controller action - Creates call stack: Clusterss::ApplciationsController calls --> Clusters::Applications::UpdateService calls --> Clusters::Applications::ScheduleUpdateService calls --> ClusterUpdateAppWorker calls --> Clusters::Applications::PatchService --> ClusterWaitForAppInstallationWorker DRY req params Adds gcp_cluster:cluster_update_app queue Schedule_update_service is uneeded Extract common logic to a parent class (UpdateService will need it) Introduce new UpdateService Fix rescue class namespace Fix RuboCop offenses Adds BaseService for create and update services Remove request_handler code duplication Fixes update command Move update_command to ApplicationCore so all apps can use it Adds tests for Knative update_command Adds specs for PatchService Raise error if update receives an unistalled app Adds update_service spec Fix RuboCop offense Use subject in favor of go Adds update endpoint specs for project namespace Adds update endpoint specs for group namespace
* | Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-052-15/+68
|\ \ | | | | | | | | | | | | | | | | | | Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
| * | Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-042-15/+68
| |/ | | | | | | | | | | | | We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
* | Merge dev master into GitLab.com masterYorick Peterse2019-03-041-1/+1
|\ \