Merge branch 'master' into hopsoft/GH342/realtime-stats

.env-sample

@@ -38,3 +38,5 @@ export APPSIGNAL_PUSH_API_KEY=
 export CDN_HOST=d2dgtjbaa79whh.cloudfront.net
 export FAKE_S3_TOKEN=1234567890
 export USER_IMPRESSION_STATS_REFRESH_INTERVAL_IN_MINUTES=60
+export MAILCHIMP_API_KEY=MAILCHIMP_API_KEY
+export MAILCHIMP_NEWSLETTER_LIST_ID=MAILCHIMP_NEWSLETTER_LIST_ID

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
-ruby "2.4.1"
-gem "sass"
+ruby "2.5.1"
+gem "sass", "~> 3.6.0"

Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ffi (1.9.23)
+    ffi (1.9.25)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    sass (3.5.5)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -15,10 +15,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  sass
+  sass (~> 3.6.0)
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.0
+   1.16.5

README.md

@@ -107,6 +107,38 @@ Please keep in mind that the focus is to create a great platform, so we might no
 
 This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).
 
+## Financial Contributions
+
+We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/codefund).
+Anyone can file an expense. If the expense makes sense for the development of the community, it will be "merged" in the ledger of our open collective by the core contributors and the person who filed the expense will be reimbursed.
+
+## Credits
+
+### Financial Contributors
+
+Thank you to all the people who have already contributed to CodeFund!
+<a href="graphs/contributors"><img src="https://opencollective.com/codefund/contributors.svg?width=890" /></a>
+
+### Backers
+
+Thank you to all our backers! [[Become a backer](https://opencollective.com/codefund#backer)]
+ <a href="https://opencollective.com/codefund#backers" target="_blank"><img src="https://opencollective.com/codefund/backers.svg?width=890"></a>
+
+### Sponsors
+
+Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/codefund#sponsor))
+
+ <a href="https://opencollective.com/codefund/sponsor/0/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/1/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/2/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/3/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/4/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/5/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/6/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/7/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/8/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/codefund/sponsor/9/website" target="_blank"><img src="https://opencollective.com/codefund/sponsor/9/avatar.svg"></a>
+
 ## Contributors
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->