summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-1/+2
|\ | | | | | | | | | | | | | | | | | | | | Pass trusted_proxies to action_dispatch as IPAddrs instead of strings Without this setting your own trusted_proxies does not work. Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524 Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004 See merge request !3970
| * Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
| | | | | | | | Without this setting your own trusted_proxies does not work.
* | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-041-15/+22
|\ \ | | | | | | | | | | | | Instrument methods used in email diffs See merge request !4038
| * | Instrument methods used in email diffsSean McGivern2016-05-041-15/+22
| | | | | | | | | | | | | | | | | | Make all of the nested constant instrumentation for core app code work the same way, add mailer instrumentation, and add instrumentation to the premailer gem.
* | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
|/ / | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* | Fix "remember me" sign in optionJacob Vosmaer2016-05-021-1/+1
| |
* | Prevent Rails filtered parameters from leaking to Sentry.Connor Shea2016-04-281-0/+3
|/ | | | As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
* Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable2016-04-282-2/+5
|\ | | | | | | | | | | | | Disable Rack Attack if admin disables it in config file Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue. See merge request !3918
| * Disable Rack Attack if admin disables it in config fileStan Hu2016-04-272-2/+5
| | | | | | | | | | Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue.
* | Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Send 'admin emails' weekly, not daily Daily seems to be to spammy, so let's default to weekly instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520 See merge request !3923
| * | Send 'admin emails' weekly, not dailyJacob Vosmaer2016-04-261-1/+1
| | | | | | | | | | | | Daily seems to be to spammy, so let's default to weekly instead.
* | | Fixes for review of GitHub Enterprise backport changesStan Hu2016-04-261-3/+3
| | |
* | | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-0/+24
| |/ |/| | | | | | | | | | | | | | | | | These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* | Remove the Devise Async gem.Connor Shea2016-04-261-1/+0
|/ | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* Instrument Gitlab::GitAccess/GitAccessWikiYorick Peterse2016-04-211-0/+4
|
* Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-141-1/+6
|\ | | | | | | | | | | | | Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-132-0/+7
| |\
| * | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-131-1/+1
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-123-2/+36
| |\ \
| * | | Rename almost all the thingsJacob Vosmaer2016-04-061-3/+3
| | | |
| * | | Rebase repo check MRJacob Vosmaer2016-04-041-1/+6
| | | |
* | | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-132-5/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
| * | | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-132-5/+3
| | | |
* | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano2016-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | external
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Closes #15105
* | | | | Adjust the default trusted_proxies to only include localhost, and allow ↵DJ Mountney2016-04-122-0/+3
| |_|_|/ |/| | | | | | | | | | | other trusted proxies to be configured.
* | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-121-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
| * | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
| |/ / / | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15162
* | | | Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractorYorick Peterse2016-04-121-3/+0
|/ / / | | | | | | | | | | | | | | | Instrumenting this class together with Gitlab::ReferenceExtractor causes a StackError for some reason. Since Gitlab::ReferenceExtractor has most of the interesting code we'll only instrument that class.
* | | Instrument Banzai codeYorick Peterse2016-04-111-0/+23
|/ /
* | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-082-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
| * Add Gitlab::Redis connection poolJacob Vosmaer2016-04-042-3/+3
| |
* | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+1
| | | | | | | | | | This allows us to track how much time of a transaction is spent in dealing with cached data.
* | Remove dumb debug statement and add many tests.Jacob Schatz2016-04-071-1/+0
| |
* | Add optional colon.Jacob Schatz2016-04-071-1/+2
| |
* | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-051-1/+2
|/ | | | Closes #14943.
* Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* Inline mailer CSS using premailer.Douwe Maan2016-03-191-0/+7
| | | | | # Conflicts: # Gemfile.lock
* Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-0/+13
|
* Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+1
| | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-1/+0
| | | This reverts merge request !3191
* Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+1
|\ | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| * Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-121-0/+1
| | | | | | | | Closes #13805
* | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
| * | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-5/+5
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
* | | Disable Rubocop for PostgreSQL patchesYorick Peterse2016-03-111-0/+2
| | | | | | | | | | | | | | | This code is mostly a copy-paste from existing pull requests so there's no point in running Rubocop on it.
* | | Patch MySQL to ignore PostgreSQL schema optionsYorick Peterse2016-03-111-0/+49
| | | | | | | | | | | | | | | This ensures that options such as `using: :gin` and PostgreSQL operator classes are ignored when loading a schema into a MySQL database.
* | | Backport Rails support for PostgreSQL opclassesYorick Peterse2016-03-111-0/+186
| |/ |/| | | | | | | | | This is needed to support creating/dumping/loading indexes that use the gin_trgm_ops operator class on PostgreSQL. These changes are taken from Rails pull request https://github.com/rails/rails/pull/19090.
View Lorry Controller Status