Skip to content

Commit

Permalink
update some gem and fix issue with travis
Browse files Browse the repository at this point in the history
  • Loading branch information
shingara committed Jul 31, 2013
1 parent fb78320 commit a40fc2e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 33 deletions.
8 changes: 3 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,9 @@ group :development, :test do
gem 'rspec-rails', '~> 2.6'
gem 'webmock', :require => false
gem 'airbrake', :require => false
unless ENV["CI"]
gem 'ruby-debug', :platform => :mri_18
gem 'debugger', :platform => :mri_19
gem 'pry-rails'
end
gem 'ruby-debug', :platform => :mri_18
gem 'debugger', :platform => :mri_19
gem 'pry-rails'
# gem 'rpm_contrib'
# gem 'newrelic_rpm'
gem 'quiet_assets'
Expand Down
56 changes: 28 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.4)
addressable (2.3.5)
airbrake (3.1.12)
activesupport
builder
json
arel (3.0.2)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.1.1)
better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
Expand All @@ -66,7 +66,7 @@ GEM
callsite (0.0.11)
campy (0.1.3)
multi_json (~> 1.0)
capistrano (2.15.4)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
Expand All @@ -90,19 +90,19 @@ GEM
rest-client
simplecov (>= 0.7)
thor
crack (0.4.0)
crack (0.4.1)
safe_yaml (~> 0.9.0)
css_parser (1.3.4)
addressable
daemons (1.1.9)
database_cleaner (0.9.1)
debug_inspector (0.0.2)
debugger (1.6.0)
debugger (1.6.1)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.2.1)
debugger-ruby_core_source (~> 1.2.3)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.2)
debugger-ruby_core_source (1.2.3)
decent_exposure (2.2.0)
devise (2.2.4)
bcrypt-ruby (~> 3.0)
Expand All @@ -111,16 +111,16 @@ GEM
warden (~> 1.2.1)
diff-lcs (1.2.4)
dotenv (0.8.0)
email_spec (1.4.0)
email_spec (1.5.0)
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
fabrication (1.3.2)
faraday (0.8.7)
multipart-post (~> 1.1)
faraday (0.8.8)
multipart-post (~> 1.2.0)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
ffi (1.9.0)
Expand Down Expand Up @@ -198,11 +198,11 @@ GEM
multi_json (1.7.7)
multi_xml (0.5.4)
multipart-post (1.2.0)
net-scp (1.1.1)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.7)
net-ssh (2.6.8)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.5.10)
Expand All @@ -224,7 +224,7 @@ GEM
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
omniauth-github (1.1.0)
omniauth-github (1.1.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.1)
Expand Down Expand Up @@ -253,7 +253,7 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
pry-rails (0.3.1)
pry-rails (0.3.2)
pry (>= 0.9.10)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
Expand Down Expand Up @@ -293,17 +293,17 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
ri_cal (0.8.8)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
rspec-core (2.14.4)
rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
rspec-mocks (2.14.2)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
Expand All @@ -315,7 +315,7 @@ GEM
rushover (0.3.0)
json
rest-client
safe_yaml (0.9.3)
safe_yaml (0.9.4)
selenium-webdriver (2.33.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
Expand All @@ -326,7 +326,7 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.5)
slop (3.4.6)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -352,26 +352,26 @@ GEM
rack (>= 1.0.0)
thor (0.18.1)
tilt (1.4.1)
timecop (0.6.1)
timecop (0.6.2.2)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
turbo-sprockets-rails3 (0.3.6)
railties (> 3.2.8, < 4.0.0)
sprockets (>= 2.0.0)
tzinfo (0.3.37)
uglifier (2.1.1)
uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
underscore-rails (1.4.4)
underscore-rails (1.5.1)
unicorn (4.6.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
useragent (0.6.0)
warden (1.2.1)
warden (1.2.3)
rack (>= 1.0)
webmock (1.12.0)
webmock (1.13.0)
addressable (>= 2.2.7)
crack (>= 0.3.2)
websocket (1.0.7)
Expand Down

0 comments on commit a40fc2e

Please sign in to comment.