Created
February 17, 2015 22:14
-
-
Save 97jaz/4fda96b4dd7033c290cd to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| index c6a353c..bb8b371 100644 | |
| --- a/Gemfile.lock | |
| +++ b/Gemfile.lock | |
| @@ -191,7 +191,6 @@ GEM | |
| i18n (~> 0.5) | |
| faraday (0.9.1) | |
| multipart-post (>= 1.2, < 3) | |
| - ffi (1.9.6) | |
| fission (0.5.0) | |
| CFPropertyList (~> 2.2) | |
| fog (1.27.0) | |
| @@ -286,26 +285,6 @@ GEM | |
| gridhook (0.2.0) | |
| multi_json (>= 1.3.0) | |
| rails (>= 3.1.0) | |
| - guard (2.11.1) | |
| - formatador (>= 0.2.4) | |
| - listen (~> 2.7) | |
| - lumberjack (~> 1.0) | |
| - nenv (~> 0.1) | |
| - notiffany (~> 0.0) | |
| - pry (>= 0.9.12) | |
| - shellany (~> 0.0) | |
| - thor (>= 0.18.1) | |
| - guard-compat (1.2.0) | |
| - guard-rake (1.0.0) | |
| - guard | |
| - rake | |
| - guard-rspec (4.5.0) | |
| - guard (~> 2.1) | |
| - guard-compat (~> 1.1) | |
| - rspec (>= 2.99.0, < 4.0) | |
| - guard-teaspoon (0.8.0) | |
| - guard (~> 2.2) | |
| - teaspoon (>= 0.8.0) | |
| haml (4.1.0.beta.1) | |
| tilt | |
| haml-rails (0.7.0) | |
| @@ -361,13 +340,8 @@ GEM | |
| actionpack (>= 3.0.0) | |
| activesupport (>= 3.0.0) | |
| kgio (2.9.3) | |
| - listen (2.8.5) | |
| - celluloid (>= 0.15.2) | |
| - rb-fsevent (>= 0.9.3) | |
| - rb-inotify (>= 0.9) | |
| loofah (2.0.1) | |
| nokogiri (>= 1.5.9) | |
| - lumberjack (1.0.9) | |
| mail (2.6.3) | |
| mime-types (>= 1.16, < 3) | |
| method_source (0.8.2) | |
| @@ -384,16 +358,12 @@ GEM | |
| mustache (0.99.8) | |
| myh_signature (0.0.2) | |
| activesupport (>= 3.2) | |
| - nenv (0.1.1) | |
| net-scp (1.2.1) | |
| net-ssh (>= 2.6.5) | |
| net-ssh (2.9.2) | |
| newrelic_rpm (3.9.9.275) | |
| - nokogiri (1.6.5) | |
| + nokogiri (1.6.6.2) | |
| mini_portile (~> 0.6.0) | |
| - notiffany (0.0.3) | |
| - nenv (~> 0.1) | |
| - shellany (~> 0.0) | |
| oauth2 (1.0.0) | |
| faraday (>= 0.8, < 0.10) | |
| jwt (~> 1.0) | |
| @@ -465,9 +435,6 @@ GEM | |
| activesupport (>= 3.0) | |
| i18n | |
| polyamorous (~> 1.1) | |
| - rb-fsevent (0.9.4) | |
| - rb-inotify (0.9.5) | |
| - ffi (>= 0.5.0) | |
| rdoc (4.2.0) | |
| json (~> 1.4) | |
| redcarpet (3.2.2) | |
| @@ -479,29 +446,30 @@ GEM | |
| responders (2.0.2) | |
| railties (>= 4.2.0.alpha, < 5) | |
| rotp (2.0.0) | |
| - rspec (3.1.0) | |
| - rspec-core (~> 3.1.0) | |
| - rspec-expectations (~> 3.1.0) | |
| - rspec-mocks (~> 3.1.0) | |
| - rspec-core (3.1.7) | |
| - rspec-support (~> 3.1.0) | |
| - rspec-expectations (3.1.2) | |
| + rspec (3.2.0) | |
| + rspec-core (~> 3.2.0) | |
| + rspec-expectations (~> 3.2.0) | |
| + rspec-mocks (~> 3.2.0) | |
| + rspec-core (3.2.0) | |
| + rspec-support (~> 3.2.0) | |
| + rspec-expectations (3.2.0) | |
| diff-lcs (>= 1.2.0, < 2.0) | |
| - rspec-support (~> 3.1.0) | |
| + rspec-support (~> 3.2.0) | |
| rspec-its (1.1.0) | |
| rspec-core (>= 3.0.0) | |
| rspec-expectations (>= 3.0.0) | |
| - rspec-mocks (3.1.3) | |
| - rspec-support (~> 3.1.0) | |
| - rspec-rails (3.1.0) | |
| - actionpack (>= 3.0) | |
| - activesupport (>= 3.0) | |
| - railties (>= 3.0) | |
| - rspec-core (~> 3.1.0) | |
| - rspec-expectations (~> 3.1.0) | |
| - rspec-mocks (~> 3.1.0) | |
| - rspec-support (~> 3.1.0) | |
| - rspec-support (3.1.2) | |
| + rspec-mocks (3.2.0) | |
| + diff-lcs (>= 1.2.0, < 2.0) | |
| + rspec-support (~> 3.2.0) | |
| + rspec-rails (3.2.0) | |
| + actionpack (>= 3.0, <= 4.2) | |
| + activesupport (>= 3.0, <= 4.2) | |
| + railties (>= 3.0, <= 4.2) | |
| + rspec-core (~> 3.2.0) | |
| + rspec-expectations (~> 3.2.0) | |
| + rspec-mocks (~> 3.2.0) | |
| + rspec-support (~> 3.2.0) | |
| + rspec-support (3.2.1) | |
| ruby_parser (3.1.3) | |
| sexp_processor (~> 4.1) | |
| safe_yaml (1.0.4) | |
| @@ -515,7 +483,6 @@ GEM | |
| json (~> 1.7, >= 1.7.7) | |
| rdoc (~> 4.0) | |
| sexp_processor (4.4.4) | |
| - shellany (0.0.1) | |
| shoulda-matchers (2.7.0) | |
| activesupport (>= 3.0.0) | |
| sidekiq (3.3.0) | |
| @@ -570,7 +537,7 @@ GEM | |
| raindrops (~> 0.7) | |
| warden (1.2.3) | |
| rack (>= 1.0) | |
| - wbix-client (0.0.6) | |
| + wbix-client (0.0.3) | |
| faraday (~> 0.9.0) | |
| httpclient (~> 2.0) | |
| web-console (2.0.0) | |
| @@ -613,9 +580,6 @@ DEPENDENCIES | |
| geokit-rails! | |
| globalize! | |
| gridhook | |
| - guard-rake | |
| - guard-rspec | |
| - guard-teaspoon | |
| haml-rails | |
| html2haml | |
| humanize | |
| @@ -643,7 +607,7 @@ DEPENDENCIES | |
| remote_syslog_logger | |
| rotp | |
| rspec-its | |
| - rspec-rails (~> 3.1.0) | |
| + rspec-rails (~> 3.2.0) | |
| rspec_api_documentation! | |
| sass-rails (~> 4.0.5) | |
| sdoc (~> 0.4.0) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment