Merge pull request #26 from karussell/patch-2

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 8203be2303cf10a5f54e74fba8f9a264181237ed..ac030d38d44be8e89318fef6fcd54f8ab427f299 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'

 
 # Require rails
 
 # Require rails

-gem 'rails', '4.0.4'
+gem 'rails', '4.1.7'

 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19


@@ -16,7 +16,7 @@ gem 'json'
 gem 'pg'
 
 # Use SCSS for stylesheets
 gem 'pg'
 
 # Use SCSS for stylesheets

-gem 'sass-rails', '~> 4.0.0'
+gem 'sass-rails', '~> 4.0.3'

 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'


@@ -34,6 +34,9 @@ gem 'jsonify-rails'
 # Use R2 for RTL conversion
 gem 'r2'
 
 # Use R2 for RTL conversion
 gem 'r2'
 

+# Use autoprefixer to generate CSS prefixes
+gem 'autoprefixer-rails'
+

 # Load rails plugins
 gem 'rails-i18n', "~> 4.0.0"
 gem 'dynamic_form'
 # Load rails plugins
 gem 'rails-i18n', "~> 4.0.0"
 gem 'dynamic_form'


@@ -41,7 +44,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'

-gem 'composite_primary_keys', '>= 6.0.1'
+gem 'composite_primary_keys', '~> 7.0.11'

 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 4.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 4.0'
 gem 'deadlock_retry', '>= 1.2.0'


@@ -84,7 +87,7 @@ end
 # Gems needed for running tests
 group :test do
   gem 'timecop'
 # Gems needed for running tests
 group :test do
   gem 'timecop'

-  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
+  gem 'minitest', '~> 5.1', :platforms => [:ruby_19, :ruby_20]

 end
 
 # Needed in development as well so rake can see konacha tasks
 end
 
 # Needed in development as well so rake can see konacha tasks