Merge branch 'hotfix/1.0.5'
This commit is contained in:
commit
feb482cef0
@ -1,6 +1,10 @@
|
||||
Changelog
|
||||
=========
|
||||
|
||||
1.0.5
|
||||
-----
|
||||
* Updated gems
|
||||
|
||||
1.0.4
|
||||
-----
|
||||
* Updated gems
|
||||
|
36
Gemfile.lock
36
Gemfile.lock
@ -78,10 +78,10 @@ GEM
|
||||
safe_yaml (~> 0.9.0)
|
||||
database_cleaner (1.0.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.3)
|
||||
delorean (2.1.0)
|
||||
@ -110,7 +110,7 @@ GEM
|
||||
i18n (0.6.4)
|
||||
i18n-js (2.1.2)
|
||||
i18n
|
||||
jquery-rails (3.0.2)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-turbolinks (1.0.0)
|
||||
@ -134,7 +134,7 @@ GEM
|
||||
railties
|
||||
method_source (0.8.1)
|
||||
mime-types (1.23)
|
||||
mini_portile (0.5.0)
|
||||
mini_portile (0.5.1)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.7.7)
|
||||
nokogiri (1.6.0)
|
||||
@ -147,7 +147,7 @@ GEM
|
||||
slop (~> 3.4)
|
||||
pry-rails (0.3.1)
|
||||
pry (>= 0.9.10)
|
||||
puma (2.3.0)
|
||||
puma (2.3.2)
|
||||
rack (>= 1.1, < 2.0)
|
||||
rack (1.5.2)
|
||||
rack-contrib (1.1.0)
|
||||
@ -177,23 +177,23 @@ GEM
|
||||
ref (1.0.5)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
rspec (2.13.0)
|
||||
rspec-core (~> 2.13.0)
|
||||
rspec-expectations (~> 2.13.0)
|
||||
rspec-mocks (~> 2.13.0)
|
||||
rspec-core (2.13.1)
|
||||
rspec-expectations (2.13.0)
|
||||
rspec (2.14.1)
|
||||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
rspec-mocks (~> 2.14.0)
|
||||
rspec-core (2.14.2)
|
||||
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.1)
|
||||
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)
|
||||
rubyzip (0.9.9)
|
||||
safe_yaml (0.9.3)
|
||||
safe_yaml (0.9.4)
|
||||
sass (3.2.9)
|
||||
sass-rails (4.0.0)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
@ -228,7 +228,7 @@ GEM
|
||||
treetop (1.4.14)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.2.0)
|
||||
turbolinks (1.3.0)
|
||||
coffee-rails
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.1.1)
|
||||
|
Loading…
x
Reference in New Issue
Block a user