diff --git a/CHANGELOG.md b/CHANGELOG.md index 248fabe..0c68255 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +0.3.1 +----- +* Updated gems + 0.3.0 ----- * Fontawesome 3.1.1 diff --git a/Gemfile b/Gemfile index 61cf165..49106e8 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ end group :test do gem 'capybara' gem 'coveralls', require: false - gem 'database_cleaner', github: 'bmabey/database_cleaner', ref: '20136e89' + gem 'database_cleaner' gem 'email_spec' gem 'launchy' gem 'rspec' diff --git a/Gemfile.lock b/Gemfile.lock index de8bbca..b702b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: git://github.com/bmabey/database_cleaner.git - revision: 20136e8987c222013d96e07c27d1230d2bbebd61 - ref: 20136e89 - specs: - database_cleaner (0.9.1) - GIT remote: git://github.com/diowa/twitter-bootstrap-rails.git revision: c0f5b77b917e7ff91978b49ff559671e4861888f @@ -83,13 +76,14 @@ GEM thor crack (0.3.2) daemons (1.1.9) + database_cleaner (1.0.1) debug_inspector (0.0.2) - debugger (1.5.0) + debugger (1.6.0) columnize (>= 0.3.1) debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.2.0) + debugger-ruby_core_source (~> 1.2.1) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.0) + debugger-ruby_core_source (1.2.2) delorean (2.1.0) chronic diff-lcs (1.2.4) @@ -137,8 +131,7 @@ GEM actionpack (>= 3.1) less (~> 2.3.1) libv8 (3.11.8.17) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) meta_request (0.2.5) @@ -220,7 +213,7 @@ GEM multi_json (~> 1.0) rubyzip websocket (~> 1.0.4) - simpleconfig (2.0.0) + simpleconfig (2.0.1) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -229,7 +222,7 @@ GEM rack (~> 1.5, >= 1.5.2) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) - slop (3.4.4) + slop (3.4.5) sprockets (2.9.3) hike (~> 1.2) multi_json (~> 1.0) @@ -283,7 +276,7 @@ DEPENDENCIES capybara coffee-rails (~> 4.0.0) coveralls - database_cleaner! + database_cleaner debugger delorean email_spec diff --git a/VERSION b/VERSION index 0d91a54..9e11b32 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0 +0.3.1