bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix/1.2.1'

Browse Source
This commit is contained in:
Geremia Taglialatela 2013-08-23 14:35:33 +02:00
commit be7e19c28c
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
Changelog
=========
1.2.1
-----
* Updated gems
1.2.0
-----
* Removed nokogiri

35
Gemfile.lock
View File

@ -38,7 +38,7 @@ GEM
tzinfo (~> 0.3.37)
addressable (2.3.5)
arel (4.0.0)
atomic (1.1.12)
atomic (1.1.13)
better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@ -91,8 +91,7 @@ GEM
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.0.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
@ -107,13 +106,13 @@ GEM
haml
tilt
hike (1.2.3)
i18n (0.6.4)
i18n (0.6.5)
i18n-js (2.1.2)
i18n
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (1.0.0)
jquery-turbolinks (2.0.0)
railties (>= 3.1.0)
turbolinks
kgio (2.8.0)
@ -124,19 +123,19 @@ GEM
less-rails (2.3.3)
actionpack (>= 3.1)
less (~> 2.3.1)
libv8 (3.11.8.17)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_request (0.2.7)
meta_request (0.2.8)
callsite
rack-contrib
railties
method_source (0.8.2)
mime-types (1.23)
mime-types (1.24)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.7.8)
multi_json (1.7.9)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
pg (0.16.0)
@ -147,7 +146,7 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
puma (2.4.0)
puma (2.5.1)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-contrib (1.1.0)
@ -181,10 +180,10 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.4)
rspec-expectations (2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.2)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
@ -193,13 +192,13 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rubyzip (0.9.9)
safe_yaml (0.9.4)
safe_yaml (0.9.5)
sass (3.2.10)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
selenium-webdriver (2.33.0)
selenium-webdriver (2.35.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@ -218,14 +217,14 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
thor (0.18.1)
thread_safe (0.1.2)
atomic
tilt (1.4.1)
treetop (1.4.14)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.3.0)

2
VERSION
View File

@ -1 +1 @@
1.2.0
1.2.1