Add gemfile.lock

whatupdave · whatupdave · commit e410fc96e614 · 2017-07-04T13:42:45.000-07:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -98,6 +98,8 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     dalli (2.7.6)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
     dotenv-rails (2.2.1)
       dotenv (= 2.2.1)
@@ -143,6 +145,8 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (0.8.4)
     icalendar (2.4.1)
@@ -187,6 +191,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.5)
       mime-types (>= 1.16, < 4)
+    mailgun-ruby (1.1.6)
+      rest-client (~> 2.0)
     meta-tags (2.4.1)
       actionpack (>= 3.2.0, < 5.2)
     method_source (0.8.2)
@@ -203,6 +209,7 @@ GEM
     minitest (5.10.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
+    netrc (0.11.0)
     newrelic_rpm (4.2.0.334)
     nio4r (2.1.0)
     nokogiri (1.7.2)
@@ -216,12 +223,6 @@ GEM
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    postmark (1.10.0)
-      json
-      rake
-    postmark-rails (0.15.0)
-      actionmailer (>= 3.0.0)
-      postmark (~> 1.10.0)
     powerpack (0.1.1)
     public_suffix (2.0.5)
     puma (3.9.0)
@@ -283,6 +284,10 @@ GEM
       rainbow (~> 2.1)
     redcarpet (3.4.0)
     redis (3.3.3)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     reverse_markdown (1.0.3)
       nokogiri
     rubocop (0.49.1)
@@ -336,6 +341,9 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
     unicode-display_width (1.2.1)
     url_safe_base64 (0.2.2)
     web-console (3.5.1)
@@ -381,13 +389,13 @@ DEPENDENCIES
   letsencrypt_plugin
   letter_opener
   lograge
+  mailgun-ruby
   meta-tags
   mini_magick
   mini_racer
   newrelic_rpm
   pg (~> 0.15)
   poltergeist
-  postmark-rails
   puma
   puma_worker_killer
   pusher
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Coderwall
 
+[![Build Status](https://travis-ci.org/coderwall/coderwall-next.svg?branch=master)](https://travis-ci.org/coderwall/coderwall-next)
+
 The codebase for [coderwall.com](https://coderwall.com). Coderwall is a developer community used by nearly half a million developers each month to learn and share programming tips.
 
 ## Prerequisites
@@ -25,4 +27,3 @@ $ heroku run rake letsencrypt_plugin
 $ heroku certs:update coderwall.com-cert.pem coderwall.com-key.pem
 
 ```
->>>>>>> Add ssl instructions
