summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * \ Merge branch 'security-50334' into 'master'Yorick Peterse2019-03-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix git clone revealing private repo's presence See merge request gitlab/gitlabhq!2937
| | * | Fix git clone revealing private repo's presenceMark Chao2019-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Ensure redirection to path with .git suffix regardless whether project exists or not.
* | | | Merge branch '40396-sidekiq-in-process-group' into 'master'Stan Hu2019-03-041-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | sidekiq: terminate child processes at shutdown See merge request gitlab-org/gitlab-ce!25669
| * | | | sidekiq: terminate child processes at shutdownNick Thomas2019-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidekiq jobs frequently spawn long-lived child processes to do work. In some circumstances, these can be reparented to init when sidekiq is terminated, leading to duplication of work and strange concurrency problems. This commit changes sidekiq so that, if run as a process group leader, it will forward `INT` and `TERM` signals to the whole process group. If the memory killer is active, it will also use the process group when resorting to `kill -9` to shut down. These changes mean that a naive `kill <pid-of-sidekiq>` will now do the right thing, killing any child processes spawned by sidekiq, as long as the process supervisor placed it in its own process group. If sidekiq isn't a process group leader, this new code is skipped.
* | | | | Types::BaseField accepts authorize after reloadBob Van Landuyt2019-03-041-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working on files in `app/graphql` the code correctly gets autoloaded. However, the redefined `Types::BaseField` would never receive the `.accepts_definition` call, causing all queries after a reload to fail. Calling `.accepts_definition` on its superclass makes sure the reloaded version also has the `authorize` definition specified.
* | | | Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' ↵Douglas Barbosa Alexandre2019-03-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Hashed Storage rollback mechanism See merge request gitlab-org/gitlab-ce!23955
| * | | | Adds Rollback functionality to HashedStorage migrationGabriel Mazetto2019-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are adding sidekiq workers and service classes to allow to rollback a hashed storage migration. There are some refactoring involved as well as part of the code can be reused by both the migration and the rollback logic.
* | | | | Refactor model and specReuben Pereira2019-03-011-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | - Move some specs into contexts - Let get_slugs method take a parameter and return a specific slug. - Add rescues when using Addressable::URI.
* | | | CE-port for 7714-view-recent-boardsHeinrich Lee Yu2019-03-012-3/+2
|/ / / | | | | | | | | | Adds additional count param to Boards::Visits::LatestService
* | | Fix double space before commentSean McGivern2019-03-011-1/+1
| | |
* | | Mark Fog initializer with frozen_string_literal: trueStan Hu2019-03-011-0/+2
| | |
* | | Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu2019-02-281-0/+50
| | |
* | | Merge branch '40396-remove-unneeded-restart-code' into 'master'Robert Speicher2019-02-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove an obsolete workaround for GRPC unavailable errors See merge request gitlab-org/gitlab-ce!25645
| * | | Revert "Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed"Nick Thomas2019-02-281-1/+1
| | | | | | | | | | | | | | | | This reverts commit 006753110a462e62f549cdf3c410e73eed068dbf.
* | | | CE port of noteable-discussion-ee-differencesPhil Hughes2019-02-281-0/+11
|/ / /
* | | add tag filter to admin runners pageAlexis Reigel2019-02-271-0/+4
| | |
* | | Merge branch '42086-project-fetch-statistics-api-http-only' into 'master'57125-heatmap-chart-typeNick Thomas2019-02-271-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project fetch statistics API (HTTP only)" Closes #42086 See merge request gitlab-org/gitlab-ce!23596
| * | | Add project http fetch statistics APIJacopo2019-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The API get projects/:id/traffic/fetches allows user with write access to the repository to get the number of clones for the last 30 days.
* | | | Prepare test suite for switch to Gitaly-embedded Git hooksJacob Vosmaer2019-02-272-3/+1
| |/ / |/| |
* | | Merge branch 'enable_trace_sidekiq_development' into 'master'Douwe Maan2019-02-261-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Turn on backtrace for sidekiq in development See merge request gitlab-org/gitlab-ce!25515
| * | | Turn on backtrace for sidekiq in developmentThong Kuah2019-02-251-0/+4
| |/ / | | | | | | | | | This enables easier debugging in GDK
* | | Merge branch '54417-improve-authorize-dsl' into 'master'Kamil Trzciński2019-02-261-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Improve GraphQL Authorization DSL Closes #57828 See merge request gitlab-org/gitlab-ce!25328
View Lorry Controller Status