Commit Graph
575 Commits
Author SHA1 Message Date
Stan Hu d46e47a5b6 Revert "Merge branch 'issues/15127' into 'master'"
This reverts merge request !3647
2016-05-19 14:09:24 +00:00
Stan Hu 3656b5db07 Merge branch 'issues/15127' into 'master'
fix #15127 ActiveJob::DeserializationError thrown

`send_devise_notification` pre-maturely enqueued the task when the user instance
has not yet been committed into the database, causing a record-not-found in the
other sidekiq process.

`devise-async` has already been taking care of asynchronous mail sending, we just
need to run it inside queue `mailers` instead of `mailer` to enable it.

The implementation of `devise-async` enqueues the task in `after_commit` hook
which is the right way to do it.

See merge request !3647
2016-05-19 06:12:34 +00:00
Kamil Trzcinski 2bea20b8ef Merge branch 'master' into docker-registry-view 2016-05-18 12:29:50 -05:00
Kamil Trzcinski 0a6c3494b0 Fix rubocop offenses 2016-05-16 23:32:55 -05:00
Yorick Peterse b933367ab3 Instrument all Grape API helpers 2016-05-17 00:16:49 +02:00
Kamil Trzcinski 89644edc4e Bring back path to registry settings 2016-05-16 17:15:38 -05:00
Kamil Trzcinski a26ec8a106 Compact host and port 2016-05-16 09:51:15 -05:00
Kamil Trzcinski 623102d455 Use registry.port to construct the registry host 2016-05-16 09:48:39 -05:00
Kamil Trzcinski 4f1e0014a7 Simplify registry configuration 2016-05-14 14:03:41 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
2016-05-12 22:41:01 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
DJ Mountney c8f23bd2ed Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
Rémy Coutable 941301339d Remove Rails monkey-patches now that we're using Rails 4.2.6
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-11 12:32:48 +02:00
DJ Mountney 9898f9b4e6 Set the standard health_check options to include the cache check. 2016-05-10 08:24:09 -07:00
DJ Mountney 67dc3b9c11 Add the health_check gem end expose the health_check route 2016-05-10 08:24:09 -07:00
Rémy Coutable 5589dcf8db Fix a few places where autoloading would fail
- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 11:51:19 +02:00
Kamil Trzcinski 1dea54c220 Remove unused parts 2016-05-09 20:35:01 +03:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Rémy Coutable 7d95d3cde7 Merge branch 'trusted-proxies-ip-addr' into 'master'
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
2016-05-09 09:47:16 +00:00
Connor Shea 9cc0937b3a Enable the Rubocop DeprecatedClassMethods cop
This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of
`.exist?`. Also fixes all existing uses of the deprecated methods.
2016-05-08 15:33:34 -06:00
Yorick Peterse 917c26ced7 Merge branch 'add-instrumentation-for-15137' into 'master'
Instrument methods used in email diffs

See merge request !4038
2016-05-04 14:25:28 +00:00
Sean McGivern f660b2173e Instrument methods used in email diffs
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.
2016-05-04 14:20:48 +01:00
Connor Shea 3004386b55 Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-03 15:43:51 -06:00
Jacob Vosmaer dc0ff9a174 Fix "remember me" sign in option 2016-05-02 17:22:03 +02:00
Kamil Trzcinski 72611f9cfa Auth token 2016-04-29 16:45:00 +02:00
Kamil Trzcinski f41a3e24d2 Added authentication service for docker registry 2016-04-29 16:45:00 +02:00
Connor Shea 519a791ef9 Prevent Rails filtered parameters from leaking to Sentry.
As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
2016-04-28 15:08:23 -06:00
DJ Mountney 9ab70184e3 Pass trusted_proxies to action_dispatch as IPAddrs instead of strings
Without this setting your own trusted_proxies does not work.
2016-04-28 12:05:45 -07:00
Rémy Coutable e675bb0aa6 Merge branch 'allow-disabling-of-rack-attack' into 'master'
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
2016-04-28 15:14:14 +00:00
Jacob Vosmaer aacb485535 Merge branch 'admin-email-frequency' into 'master'
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
2016-04-28 11:07:42 +00:00
Stan Hu 1d6fdcea95 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.
2016-04-27 07:22:02 -07:00
Stan Hu c47183d787 Fixes for review of GitHub Enterprise backport changes 2016-04-26 21:02:45 -07:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE
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.
2016-04-26 21:00:55 -07:00
Connor Shea 1cc614f2bd Remove the Devise Async gem.
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
2016-04-26 10:41:48 -06:00
Jacob Vosmaer 2e072034a6 Send 'admin emails' weekly, not daily
Daily seems to be to spammy, so let's default to weekly instead.
2016-04-26 11:54:37 +02:00
Yorick Peterse c5cb68fd03 Instrument Gitlab::GitAccess/GitAccessWiki 2016-04-21 19:15:32 +02:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master'
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
2016-04-14 17:15:58 +00:00
Valery Sizov c0678f2d28 Merge branch 'redis_config_consistency' into 'master'
Redis configuration consistency

Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e

See merge request !3697
2016-04-13 18:34:11 +00:00
Valery Sizov 2244aaf98f Redis configuration consistency 2016-04-13 20:57:19 +03:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +02:00
Marin Jankovski c746046992 Merge branch 'external-omniauth-providers' into 'master'
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
2016-04-13 13:09:47 +00:00
Dmitriy Zaporozhets ab4ea3720c Merge branch 'rs-archive-cache-worker-cron' into 'master'
Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
2016-04-13 12:53:01 +00:00
DJ Mountney 38cff18af0 Adjust the default trusted_proxies to only include localhost, and allow other trusted proxies to be configured. 2016-04-12 10:42:59 -07:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Robert Speicher cba2c437e5 Move RepositoryArchiveCacheWorker to sidekiq-cron
Closes #15105
2016-04-12 11:12:05 -04:00