Commit Graph
1604 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 90ae445ba9 Merge branch 'rs-remove-wall_enabled' into 'master'
Remove `wall_enabled` field from Project



See merge request !4089
2016-05-09 10:02:59 +00: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
Robert Speicher 0e29653f51 Remove wall_enabled field from Project 2016-05-08 15:47:42 -04:00
Artem Sidorenko fb5682e7cd Use the new admin settings for gravatar 2016-05-04 17:45:29 +02: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
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Jacob Vosmaer dc0ff9a174 Fix "remember me" sign in option 2016-05-02 17:22:03 +02:00
Robert Speicher 40c38644a8 Merge branch 'add-parameters' into 'master'
Add more parameters to the filter_parameters config.

Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.

In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs.

cc: @stanhu 

See merge request !3971
2016-04-30 01:48:05 +00:00
Connor Shea 8d3debe4cc Add more parameters to the filter_parameters config.
Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.
2016-04-29 18:44:49 -06:00
Robert Speicher ccd3f70765 Merge branch 'sentry-filter' into 'master'
Prevent Rails filtered parameters from leaking to Sentry.

As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/

See merge request !3974
2016-04-29 18:10:53 +00: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
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04: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
Rémy Coutable 7aff855bc7 Merge branch 'fix-github-enterprise-imports' into 'master'
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.

See merge request !3892
2016-04-28 09:37:13 +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
Dmitriy Zaporozhets 47d269c1aa Merge branch 'rs-letter_opener_web' into 'master'
Add letter_opener_web gem

Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.

See merge request !3893
2016-04-27 13:23:40 +00: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
Douwe Maan d3462e711c Fix issue with impersonation 2016-04-22 23:21:56 +02:00
Robert Speicher 702380f1ae Add letter_opener_web gem
Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.
2016-04-22 16:13:59 -04:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX
Closes #4228
2016-04-21 20:20:09 -04:00
Yorick Peterse c5cb68fd03 Instrument Gitlab::GitAccess/GitAccessWiki 2016-04-21 19:15:32 +02:00
Tomasz Maczukin bf4371d60d Switch raw trace to use X-Sendfile header 2016-04-19 23:17:49 +02:00
Tomasz Maczukin 27d1349f2b Add raw trace output for GitLab Workhorse 2016-04-19 23:17:49 +02:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-18 15:39:07 +08:00
Rémy Coutable ddec8e777f Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'
Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717
2016-04-15 08:19:01 +00:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 09:45:58 +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
Rémy Coutable c414e4342b Merge branch 'async-related-mrs' into 'master'
Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678
2016-04-13 16:06:36 +00: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
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +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 bb372ac97f Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting 2016-04-12 10:42:59 -07: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
Douwe Maan 4516f40dfe Merge branch 'decouple-member-notification' into 'master'
Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3421
2016-04-12 16:39:40 +00: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
Jacob Vosmaer ea787165b3 Move 'clear checks' button to applicatoin settings 2016-04-12 17:32:58 +02:00
Robert Speicher cba2c437e5 Move RepositoryArchiveCacheWorker to sidekiq-cron
Closes #15105
2016-04-12 11:12:05 -04:00
Douglas Barbosa Alexandre ef22b76b73 Simplify Projects::NotificationSettingsController 2016-04-12 12:10:58 -03: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