From 85113ca0954d076ad0e2e8514be2968d34eb3e7b Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 23 Mar 2016 21:26:29 +0100 Subject: upgrade: use recent gems - broken We can move to rails 4.2 with client_side_validations 4.2, simple_form 3.2 and bootstrap 3 Now we only need to migrate to these new dependencies. ;) --- Gemfile | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a38d1e9..5b5a33b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,12 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) ## CORE # rake 11.x throws lots of warnings about rails 3.2 code -gem "rake", "~> 10.4" -gem "rails", "~> 3.2.21" +gem "rake" +gem "rails", "~> 4.2.6" gem "couchrest", "~> 1.1.3" gem "couchrest_model", "~> 2.0.0" if ARGV.grep(/assets:precompile/).empty? - gem "couchrest_session_store", "= 0.3.1" + gem "couchrest_session_store", "~> 0.4.1" end ## AUTHENTICATION @@ -30,8 +30,7 @@ gem 'rails-i18n' # locale files for built-in validation messages and times gem 'common_languages', :path => 'vendor/gems/common_languages' ## VIEWS -gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be - # issues with 0.14.0 when using couchrest +gem 'kaminari' gem 'rdiscount' # for rendering .md templates ## ASSETS @@ -39,19 +38,13 @@ gem "jquery-rails" gem "simple_form" gem 'client_side_validations' gem 'client_side_validations-simple_form' -gem "haml-rails", "= 0.4.0" # The last version of haml-rails to support Rails 3. -gem "bootstrap-sass", "= 2.3.2.2" # The last 2.x version. Bootstrap-sass versions - # tracks the version of Bootstrap. We currently require - # Bootstrap v2 because client side validations is incompatible - # with Bootstrap v3. When upgrading to Rails 4, see - # https://github.com/twbs/bootstrap-sass -gem "sass-rails", "~> 3.2.5" # Only version supported by bootstrap-sass 2.3.2.2 +gem "haml-rails" +gem "bootstrap-sass" +gem "sass-rails" gem 'quiet_assets' # stops logging all the asset requests group :production do - gem "uglifier", "~> 1.2.7" # javascript compression https://github.com/lautis/uglifier - # this must not be included in development mode, or js - # will get included twice. - gem 'therubyracer', "~> 0.12.2", :platforms => :ruby + gem "uglifier" + gem 'therubyracer', :platforms => :ruby # ^^ See https://github.com/sstephenson/execjs#readme # for list of supported runtimes. end @@ -68,7 +61,7 @@ group :test do gem 'phantomjs-binaries' # binaries specific to the os # moching and stubbing - gem 'mocha', '~> 0.13.0', :require => false + gem 'mocha', :require => false gem 'minitest-stub-const' # why? # generating test data @@ -93,17 +86,13 @@ group :production do end group :development do - gem "better_errors", '1.1.0' + gem "better_errors" gem "binding_of_caller" end group :test, :debug do # bundler on jessie doesn't support `:platforms => :ruby_21` - if RUBY_VERSION < "2.0" - gem 'debugger' - else - gem 'byebug' - end + gem 'byebug' end ## -- cgit v1.2.3 From abf600089a4bc4b5c7271e17b1fd95a95deb293f Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 23 Mar 2016 21:35:08 +0100 Subject: upgrade: couchrest 2.0.0.rc3 couchrest model 2.1.0.beta2 The latter supports Active Model >= 4.1 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5b5a33b..071dd3c 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,8 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) # rake 11.x throws lots of warnings about rails 3.2 code gem "rake" gem "rails", "~> 4.2.6" -gem "couchrest", "~> 1.1.3" -gem "couchrest_model", "~> 2.0.0" +gem "couchrest", "~> 2.0.0.rc3" +gem "couchrest_model", "~> 2.1.0.beta2" if ARGV.grep(/assets:precompile/).empty? gem "couchrest_session_store", "~> 0.4.1" end -- cgit v1.2.3 From c7ef6adcd20e9ac9ca729a3ee2a718d31fbb6b51 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 23 Mar 2016 22:46:06 +0100 Subject: upgrade: add responders gem as a stopgap meassure respond_with is discouraged. --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 071dd3c..bf05642 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) # rake 11.x throws lots of warnings about rails 3.2 code gem "rake" gem "rails", "~> 4.2.6" +# TODO: drop this and the respond_with usage +gem 'responders', '~> 2.0' gem "couchrest", "~> 2.0.0.rc3" gem "couchrest_model", "~> 2.1.0.beta2" if ARGV.grep(/assets:precompile/).empty? -- cgit v1.2.3 From 54661746ffa9f113c6b489a4d5ba170a27874ad1 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 24 Mar 2016 11:10:48 +0100 Subject: upgrade: migrate config environment.rb boot.rb application.rb -> adopted according to http://railsdiff.org/3.2.22.2/4.2.6 Also dropped quite_assets - not sure if this is still needed with rails 4.2. If it is we can bring it back. --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index bf05642..0df9357 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,6 @@ gem 'client_side_validations-simple_form' gem "haml-rails" gem "bootstrap-sass" gem "sass-rails" -gem 'quiet_assets' # stops logging all the asset requests group :production do gem "uglifier" gem 'therubyracer', :platforms => :ruby -- cgit v1.2.3 From c9f24739664e9d4f7bcdafa87c7d53a5f339cbae Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 2 May 2016 21:16:36 -0300 Subject: upgrade: couchrest_session_store 0.4.2 Uses the latest couchrest and couchrest_model. Also fixes issues with ruby 2.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0df9357..f327281 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'responders', '~> 2.0' gem "couchrest", "~> 2.0.0.rc3" gem "couchrest_model", "~> 2.1.0.beta2" if ARGV.grep(/assets:precompile/).empty? - gem "couchrest_session_store", "~> 0.4.1" + gem "couchrest_session_store", "~> 0.4.2" end ## AUTHENTICATION -- cgit v1.2.3 From 77a75ef44e98ea3756161dbe8e52ad994e4e098d Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 4 Jul 2016 14:25:29 +0200 Subject: install: remove thin and thus eventmachine as a dependency They led to some install issues. No need to pick a server for dev env. --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f327281..9689a94 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,6 @@ group :test do end group :test, :development do - gem 'thin' gem 'i18n-missing_translations' gem 'pry' end -- cgit v1.2.3 From 3c6347de6b8dfa86fb4ae23bd07ae4b77db1742c Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 15 Aug 2016 12:02:06 +0200 Subject: upgrade: everything but rails (upgraded before) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9689a94..1e82977 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) ## CORE # rake 11.x throws lots of warnings about rails 3.2 code gem "rake" -gem "rails", "~> 4.2.6" +gem "rails", "~> 4.2.7" # TODO: drop this and the respond_with usage gem 'responders', '~> 2.0' gem "couchrest", "~> 2.0.0.rc3" -- cgit v1.2.3 From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Wed, 24 Aug 2016 15:23:07 +0200 Subject: Update with Twitter --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1e82977..3b5435e 100644 --- a/Gemfile +++ b/Gemfile @@ -98,6 +98,7 @@ end ## ## OPTIONAL GEMS AND ENGINES ## +gem 'twitter' enabled_engines.each do |name, gem_info| gem gem_info[:name], :path => gem_info[:path], :groups => gem_info[:env] -- cgit v1.2.3