diff --git a/Gemfile b/Gemfile index 8db7d813f8e5e..4b9305b530255 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,13 @@ source "http://rubygems.org" -gem "rails", "3.2.5" +gem "rails", "4.0.0" # Supported DBs gem "sqlite3" gem "mysql2" # Auth -gem "devise", "~> 2.1.0" +gem "devise", "~> 3.0.0" # GITLAB patched libs gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" @@ -21,7 +21,7 @@ gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" gem "grape", "~> 0.2.1" gem "stamp" gem "kaminari" -gem "haml-rails" +gem "haml-rails", ">= 0.3.5" gem "carrierwave" gem "six" gem "ffaker" @@ -31,7 +31,7 @@ gem "thin" gem "unicorn" gem "git" gem "acts_as_list" -gem "acts-as-taggable-on", "2.3.1" +gem "acts-as-taggable-on", "2.4.1" gem "drapper" gem "resque", "~> 1.20.0" gem "httparty" @@ -43,12 +43,12 @@ gem 'tabs_on_rails' gem 'settingslogic' group :assets do - gem "sass-rails", "3.2.5" - gem "coffee-rails", "3.2.2" + gem "sass-rails", "4.0.0" + gem "coffee-rails", "4.0.0" gem "uglifier", "1.0.3" gem "therubyracer" - gem 'chosen-rails' + gem 'chosen-rails', '>= 0.9.11.1' gem "jquery-rails", "2.0.2" gem "jquery-ui-rails", "0.5.0" gem "modernizr", "2.5.3"