diff --git a/temp_file/Gemfile b/temp_file/Gemfile index 2d947e2..20d68c9 100644 --- a/temp_file/Gemfile +++ b/temp_file/Gemfile @@ -70,7 +70,7 @@ gem 'fugit', '1.9.0' #fix sytax error dependency for rufus if RUBY_VERSION.to_f == 2.1 gem 'faraday', '0.15.4' - gem 'declarative','0.0.10' + # gem 'declarative','0.0.10' gem 'mime-types','~>3.3.1' gem 'mimemagic','0.3.9' gem 'public_suffix','~>3.1.1' @@ -78,8 +78,18 @@ if RUBY_VERSION.to_f == 2.1 #social gems gem 'phantomjs','~>2.1.1.0' gem "omniauth-google-oauth2" + # source "https://gitlab.tp.rulingcom.com/api/packages/library/rubygems" do + # source "https://gitlab.tp.rulingcom.com/api/packages/library/rubygems" do + # gem 'googleauth', "0.14.0" + # end + # source "https://gitlab.tp.rulingcom.com/api/packages/library/rubygems" do + # gem 'google-apis-core', "0.4.2" + # gem 'google-apis-generator', "0.4.1" + # gem 'google-api-client', "0.53.0" + # end gem 'googleauth', git: 'http://gitlab.tp.rulingcom.com/chiu/google-auth-library-ruby.git' gem 'google-api-client', git: 'http://gitlab.tp.rulingcom.com/chiu/google-api-ruby-client.git' + #rails gem gem 'rake','~> 12.3.3' gem 'sassc-rails', '~>1.3.0' @@ -117,8 +127,8 @@ if RUBY_VERSION.to_f == 2.1 #file uploading and carrierwave gem "mini_magick", "3.5.0" - gem 'carrierwave' - gem 'carrierwave-mongoid','~> 0.10.0', :require => 'carrierwave/mongoid' + gem 'carrierwave', '1.3.4' + gem 'carrierwave-mongoid','~> 1.4.0', :require => 'carrierwave/mongoid' gem 'zip-zip' gem 'kaminari', '~> 1.0.1' gem 'kaminari-mongoid', '~> 0.1.0' @@ -130,7 +140,8 @@ if RUBY_VERSION.to_f == 2.1 gem 'zhconv' gem 'time_difference' gem 'execjs', '~> 2.7.0' - gem 'therubyracer' + # gem 'therubyracer' + gem 'duktape' #excel gem 'axlsx_rails' @@ -163,7 +174,7 @@ else gem 'sorted_set' gem 'faraday' gem 'ffi', '1.14.2' - gem 'declarative' + # gem 'declarative' gem 'mime-types' gem 'mimemagic' gem 'public_suffix' @@ -217,7 +228,7 @@ else #file uploading and carrierwave gem "mini_magick" - gem 'carrierwave', '0.11.2' + gem 'carrierwave'#, '0.11.2' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' gem 'zip-zip' gem 'kaminari'