home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,914 Commits 48 Branches 340 Tags
ae25c19ee5dcfae8ea977b2014657ecc6c3eaf3d
Commit Graph
549 Commits
Author SHA1 Message Date
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
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
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
Rémy Coutable 0b8852d3c4 Merge branch 'instrument-service-classes' into 'master' 
Instrument all service classes

This will help us see where (mostly) Sidekiq code is spending time.

See merge request !3675
 2016-04-12 14:39:54 +00:00
Yorick Peterse b3d8b995c3 Un-instrument Banzai::ReferenceExtractor 
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.
 2016-04-12 14:10:35 +02:00
Yorick Peterse 8299129382 Instrument all service classes 
Fixes gitlab-org/gitlab-ce#15162
 2016-04-12 12:24:16 +02:00
Yorick Peterse 935f913165 Instrument Banzai code 2016-04-11 17:43:12 +02:00
Patricio Cano 12e6084667 Allow external_providers for Omniauth to be defined to mark these users as external 2016-04-11 10:16:15 -05:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master' 
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
 2016-04-08 22:26:53 +00:00
Yorick Peterse c56f702ec3 Instrument Rails cache code 
This allows us to track how much time of a transaction is spent in
dealing with cached data.
 2016-04-08 17:54:52 +02:00
Jacob Schatz 0bbeebc8f9 Remove dumb debug statement and add many tests. 2016-04-07 08:47:29 -04:00
Jacob Schatz 8172d2c1f2 Add optional colon. 2016-04-07 08:17:05 -04:00
Jacob Vosmaer 5cf56e5647 Rename almost all the things 2016-04-06 13:47:05 +02:00
Robert Speicher ee1de011d1 Premailer shouldn't remove script tags from our emails 
Closes #14943.
 2016-04-05 17:03:34 -04:00
Jacob Vosmaer bf9526739b Rebase repo check MR 2016-04-04 17:23:43 +02:00
Jacob Vosmaer 0163e27631 Add Gitlab::Redis connection pool 2016-04-04 17:00:09 +02:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project. 
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
 2016-03-31 17:09:36 -06:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer. 
# Conflicts:
#	Gemfile.lock
 2016-03-19 20:04:10 +01:00
Hiroyuki Sato 8acad49fe0 Support Wiki with UTF-8 page name 2016-03-16 02:17:07 +09:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching 
Closes #13805
 2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master' 
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
 2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher 12082db41e Disable Rubocop for PostgreSQL patches 
This code is mostly a copy-paste from existing pull requests so there's
no point in running Rubocop on it.
 2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher d38dcf1e3b Patch MySQL to ignore PostgreSQL schema options 
This ensures that options such as `using: :gin` and PostgreSQL operator
classes are ignored when loading a schema into a MySQL database.
 2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 49e122df85 Backport Rails support for PostgreSQL opclasses 
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.
 2016-03-11 15:25:22 -05:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00