Skip to content

Instantly share code, notes, and snippets.

@sanemat
Last active August 29, 2015 14:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sanemat/28ab1fc97084abdcf188 to your computer and use it in GitHub Desktop.
Save sanemat/28ab1fc97084abdcf188 to your computer and use it in GitHub Desktop.
diff --git a/Gemfile.lock b/Gemfile.lock
index 89c545a..edaab04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
- jquery-rails (3.1.2)
+ jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
@@ -289,3 +289,6 @@ DEPENDENCIES
unicorn
unicorn-worker-killer
webmock
+
+BUNDLED WITH
+ 1.10.4
diff --git a/Gemfile.lock b/Gemfile.lock
index 89c545a..4944d83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
- jquery-rails (3.1.2)
+ jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
@@ -239,6 +239,8 @@ GEM
crack (>= 0.3.2)
xpath (2.0.0)
nokogiri (~> 1.3)
+ zeus (0.15.4)
+ method_source (>= 0.6.7)
PLATFORMS
ruby
@@ -289,3 +291,7 @@ DEPENDENCIES
unicorn
unicorn-worker-killer
webmock
+ zeus
+
+BUNDLED WITH
+ 1.10.4
diff --git a/Gemfile.lock b/Gemfile.lock
index 01c176d..5b140bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
- jquery-rails (3.1.2)
+ jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
@@ -289,6 +289,3 @@ DEPENDENCIES
unicorn
unicorn-worker-killer
webmock
-
-BUNDLED WITH
- 1.10.4
diff --git a/Gemfile b/Gemfile
index d042161..5ba29e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ group :test do
gem 'rspec-rails', group: :development
gem 'shoulda-matchers'
gem 'timecop'
- gem 'webmock'
+ # gem 'webmock'
end
group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 01c176d..cdc442a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,8 +55,6 @@ GEM
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
- crack (0.4.2)
- safe_yaml (~> 1.0.0)
database_rewinder (0.5.2)
diff-lcs (1.2.5)
docker-api (1.21.4)
@@ -97,7 +95,7 @@ GEM
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
i18n (0.7.0)
- jquery-rails (3.1.2)
+ jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
@@ -234,9 +232,6 @@ GEM
unicorn-worker-killer (0.4.3)
get_process_mem (~> 0)
unicorn (~> 4)
- webmock (1.21.0)
- addressable (>= 2.3.6)
- crack (>= 0.3.2)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -288,7 +283,3 @@ DEPENDENCIES
uglifier (>= 1.3.0)
unicorn
unicorn-worker-killer
- webmock
-
-BUNDLED WITH
- 1.10.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment