From c01cbf6b576b0857619fe0376894ad352eb3d5f7 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 18:06:44 +0100 Subject: [PATCH 1/7] change branding --- app/views/layouts/application.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 57568d4..f69b1ca 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - the hacker school confessional + the VU koor confessional <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> @@ -17,7 +17,7 @@

<%= link_to(confessions_path) do %> - $ the hacker school confessional  + $ the VU koor confessional  <% end %>

From 4e45dd075258d745ac7b253909d19425654da476 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 18:20:26 +0100 Subject: [PATCH 2/7] update missing dep --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1d39bd1..1cc2f65 100644 --- a/Gemfile +++ b/Gemfile @@ -22,8 +22,8 @@ group :assets do gem 'uglifier', '1.2.3' end -gem 'jquery-rails', '2.0.0' +gem 'jquery-rails', '2.0.3' group :production do gem 'pg', '0.12.2' -end \ No newline at end of file +end diff --git a/Gemfile.lock b/Gemfile.lock index 245c053..85b3d7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM hike (1.2.1) i18n (0.6.0) journey (1.0.4) - jquery-rails (2.0.0) + jquery-rails (2.0.3) railties (>= 3.2.0.beta, < 5.0) thor (~> 0.14) json (1.7.3) @@ -116,7 +116,7 @@ DEPENDENCIES bootstrap-sass (= 2.0.0) bootstrap-will_paginate (= 0.0.6) coffee-rails (= 3.2.2) - jquery-rails (= 2.0.0) + jquery-rails (= 2.0.3) pg (= 0.12.2) pusher rails (= 3.2.6) From e17c28e7f5753c16450a474d439e83fb4b54faa7 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 18:46:51 +0100 Subject: [PATCH 3/7] pusher --- config/environments/production.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index 6f13c4b..46d6e92 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,10 @@ Confessional::Application.configure do + + require 'pusher' + + Pusher.app_id = '112785' + Pusher.key = 'c2c3fbab7bc6f31e77e7' + Pusher.secret = 'fb9026ac4a28ac41ce1c' # Settings specified here will take precedence over those in config/application.rb # Code is not reloaded between requests From 8c7f958fc752be2e3e36c074947d010e61083c74 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 19:52:15 +0100 Subject: [PATCH 4/7] delete vendor plugins --- vendor/plugins/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 vendor/plugins/.gitkeep diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep deleted file mode 100644 index e69de29..0000000 From 0c4486742cab1f4b3fda7c5dd82603fd4b40afa1 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 20:43:05 +0100 Subject: [PATCH 5/7] deps --- Gemfile | 3 +- Gemfile.lock | 127 --------------------------------------------------- 2 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile index 1cc2f65..88bb764 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.6' +gem 'rails', '3.2.18' gem 'bootstrap-sass', '2.0.0' gem 'will_paginate', '3.0.3' gem 'bootstrap-will_paginate', '0.0.6' @@ -26,4 +26,5 @@ gem 'jquery-rails', '2.0.3' group :production do gem 'pg', '0.12.2' + gem 'rails_12factor' end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 85b3d7b..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,127 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) - bootstrap-sass (2.0.0) - bootstrap-will_paginate (0.0.6) - will_paginate - builder (3.0.0) - coffee-rails (3.2.2) - coffee-script (>= 2.2.0) - railties (~> 3.2.0) - coffee-script (2.2.0) - coffee-script-source - execjs - coffee-script-source (1.3.3) - erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.4) - jquery-rails (2.0.3) - railties (>= 3.2.0.beta, < 5.0) - thor (~> 0.14) - json (1.7.3) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.19) - multi_json (1.3.6) - pg (0.12.2) - polyglot (0.3.3) - pusher (0.9.4) - multi_json (~> 1.0) - signature (~> 0.1.2) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) - bundler (~> 1.0) - railties (= 3.2.6) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - sass (3.1.19) - sass-rails (3.2.4) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - signature (0.1.3) - sprockets (2.1.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - thor (0.15.3) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.3) - execjs (>= 0.3.0) - multi_json (>= 1.0.2) - uuidtools (2.1.2) - will_paginate (3.0.3) - -PLATFORMS - ruby - -DEPENDENCIES - bootstrap-sass (= 2.0.0) - bootstrap-will_paginate (= 0.0.6) - coffee-rails (= 3.2.2) - jquery-rails (= 2.0.3) - pg (= 0.12.2) - pusher - rails (= 3.2.6) - sass-rails (= 3.2.4) - sqlite3 (= 1.3.5) - uglifier (= 1.2.3) - uuidtools - will_paginate (= 3.0.3) From 7bd1c59e31cd743cd5a5eea723aecf22be64563e Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 21:02:40 +0100 Subject: [PATCH 6/7] lock --- Gemfile.lock | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..a131fbd --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,134 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.18) + actionpack (= 3.2.18) + mail (~> 2.5.4) + actionpack (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.18) + activesupport (= 3.2.18) + builder (~> 3.0.0) + activerecord (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) + activesupport (3.2.18) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + bootstrap-sass (2.0.0) + bootstrap-will_paginate (0.0.6) + will_paginate + builder (3.0.4) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.3.0) + coffee-script-source + execjs + coffee-script-source (1.9.1) + erubis (2.7.0) + execjs (2.4.0) + hike (1.2.3) + httpclient (2.6.0.1) + i18n (0.7.0) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.2) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + multi_json (1.11.0) + pg (0.12.2) + polyglot (0.3.5) + pusher (0.14.4) + httpclient (~> 2.5) + multi_json (~> 1.0) + signature (~> 0.1.8) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (3.2.18) + actionmailer (= 3.2.18) + actionpack (= 3.2.18) + activerecord (= 3.2.18) + activeresource (= 3.2.18) + activesupport (= 3.2.18) + bundler (~> 1.0) + railties (= 3.2.18) + rails_12factor (0.0.3) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.4) + rails_stdout_logging (0.0.3) + railties (3.2.18) + actionpack (= 3.2.18) + activesupport (= 3.2.18) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.4.2) + rdoc (3.12.2) + json (~> 1.4) + sass (3.4.13) + sass-rails (3.2.4) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + signature (0.1.8) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.5) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.43) + uglifier (1.2.3) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) + uuidtools (2.1.5) + will_paginate (3.0.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootstrap-sass (= 2.0.0) + bootstrap-will_paginate (= 0.0.6) + coffee-rails (= 3.2.2) + jquery-rails (= 2.0.3) + pg (= 0.12.2) + pusher + rails (= 3.2.18) + rails_12factor + sass-rails (= 3.2.4) + sqlite3 (= 1.3.5) + uglifier (= 1.2.3) + uuidtools + will_paginate (= 3.0.3) From 0260fc7aa449f4c12af88e1756bb21d1264d8a93 Mon Sep 17 00:00:00 2001 From: Pepijn de Vos Date: Wed, 25 Mar 2015 21:07:54 +0100 Subject: [PATCH 7/7] sass version --- Gemfile | 1 + Gemfile.lock | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 88bb764..3f790b6 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ end # in production environments by default. group :assets do gem 'sass-rails', '3.2.4' + gem 'sass', '3.2.13' gem 'coffee-rails', '3.2.2' gem 'uglifier', '1.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index a131fbd..e596c19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ GEM rake (10.4.2) rdoc (3.12.2) json (~> 1.4) - sass (3.4.13) + sass (3.2.13) sass-rails (3.2.4) railties (~> 3.2.0) sass (>= 3.1.10) @@ -127,6 +127,7 @@ DEPENDENCIES pusher rails (= 3.2.18) rails_12factor + sass (= 3.2.13) sass-rails (= 3.2.4) sqlite3 (= 1.3.5) uglifier (= 1.2.3)