Skip to content

Commit

Permalink
upgrading to Rails 4.0.4 and upgrading gems
Browse files Browse the repository at this point in the history
  • Loading branch information
Franco Sellitto committed Mar 31, 2014
1 parent bc256c2 commit 15f904f
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 79 deletions.
16 changes: 8 additions & 8 deletions Gemfile
@@ -1,8 +1,8 @@
source 'http://rubygems.org'

gem 'rails', '4.0.3'
gem 'rails', '4.0.4'

gem 'active_hash', '~> 0.9'
gem 'active_hash', '~> 1.3'
gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
gem 'acts-as-dag', :git => 'https://github.com/jheiss/acts-as-dag.git', :branch => 'rails4' # TOOD use instead ?? gem 'dagnabit', '2.2.6'
gem 'barby', '~> 0.5.0'
Expand All @@ -27,13 +27,13 @@ gem 'execjs'
gem 'factory_girl', '~> 4.1', :groups => [:test, :development]
gem 'factory_girl_rails', '~> 4.1', :groups => [:test, :development]
gem 'faker', :groups => [:test, :development]
gem 'font-awesome-rails', '~> 3.2.1'
gem 'font-awesome-rails', '~> 4.0'
gem 'geocoder', '~> 1.1'
gem 'gettext_i18n_rails', '~> 0.8'
gem 'guard-jasmine', '~> 1.11', :group => [:test, :development]
gem 'gettext_i18n_rails', '~> 1.0'
gem 'guard-jasmine', '~> 1.19', :group => [:test, :development]
gem 'haml', '~> 3.1'
gem 'haml_assets', '~> 0.2'
gem 'jquery-rails', '2.1.3' # '~> 2.1' FIXME the version 2.1.4 clashes with underscore-rails 1.4.2.1
gem 'jquery-rails', '~> 3.1'
gem 'jquery-tmpl-rails', '~> 1.1'
gem 'jruby-openssl', :platform => :jruby
gem 'json', '~> 1.8'
Expand All @@ -46,7 +46,7 @@ gem 'mysql2', '~> 0.3.11', :platform => :mri
#gem 'net-ldap', '0.2.2', :require => 'net/ldap' # Never upgrade beyond 0.2.2, ruby-net-ldap has broken in many unpredictable ways. Wait for 1.0.0 before upgrading, at least 0.2.2 works.
gem 'net-ldap', :require => 'net/ldap'
gem 'newrelic_rpm', '~> 3.5', :group => [:profiling, :development]
gem 'paperclip', '~> 3.5'
gem 'paperclip', '~> 4.1'
gem 'phantomjs', '~> 1.9.7', :group => [:test, :development] # headless webdriver (UI & JS tests)
gem 'poltergeist'
gem 'protected_attributes', '~> 1.0'
Expand All @@ -70,7 +70,7 @@ gem 'thin', :group => :development, :platform => :mri # web server (Webrick do n
gem 'timecop', '~> 0.7', :group => [:test, :development]
gem 'trinidad', :group => :development, :platform => :jruby # web server (Webrick do not support keep-alive connections)
gem 'uglifier', '~> 2.4'
gem 'underscore-rails', '~> 1.4'
gem 'underscore-rails', '~> 1.6'
gem 'uuidtools', '~> 2.1' # needed for creating unique ids during tests (factories)
gem 'will_paginate', '~> 3.0'
gem 'yard', :group => [:test, :development]

0 comments on commit 15f904f

Please sign in to comment.