From 390c19e1a6f9b8bee13134d04c3d7e980cef2a3a Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Mon, 2 Mar 2015 17:34:27 +0100 Subject: [PATCH 1/5] Update gems --- Gemfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 962f571..82c220b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.0) - autoprefixer-rails (5.1.5) + autoprefixer-rails (5.1.7) execjs json bcrypt (3.1.10) @@ -50,7 +50,7 @@ GEM autoprefixer-rails (>= 5.0.0.1) sass (>= 3.2.19) builder (3.2.2) - codemirror-rails (4.8) + codemirror-rails (5.0) railties (>= 3.0, < 5) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -58,10 +58,10 @@ GEM coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.9.0) - coveralls (0.7.9) + coffee-script-source (1.9.1) + coveralls (0.7.11) multi_json (~> 1.10) - rest-client (~> 1.7) + rest-client (>= 1.6.8, < 2) simplecov (~> 0.9.1) term-ansicolor (~> 1.3) thor (~> 0.19.1) @@ -78,11 +78,11 @@ GEM erubis (2.7.0) execjs (2.3.0) ffi (1.9.6) - globalid (0.3.2) + globalid (0.3.3) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) - jbuilder (2.2.6) + jbuilder (2.2.8) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (4.0.3) @@ -100,7 +100,7 @@ GEM mini_portile (0.6.2) minitest (5.5.1) multi_json (1.10.1) - netrc (0.10.2) + netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) @@ -138,11 +138,11 @@ GEM json (~> 1.4) responders (2.1.0) railties (>= 4.2.0, < 5) - rest-client (1.7.2) + rest-client (1.7.3) ffi (~> 1.9) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - sass (3.4.11) + sass (3.4.13) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -152,11 +152,11 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simplecov (0.9.1) + simplecov (0.9.2) docile (~> 1.1.0) multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -179,15 +179,15 @@ GEM thread_safe (~> 0.1) tzinfo-data (1.2015.1) tzinfo (>= 1.0.0) - uglifier (2.7.0) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) warden (1.2.3) rack (>= 1.0) - web-console (2.0.0) - activemodel (~> 4.0) + web-console (2.1.0) + activemodel (>= 4.0) binding_of_caller (>= 0.7.2) - railties (~> 4.0) + railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) will_paginate (3.0.7) will_paginate-bootstrap (1.0.1) From cd1f5193761a0794302f5d4eac6b267ec08f9f78 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Tue, 8 Sep 2015 23:27:04 +0200 Subject: [PATCH 2/5] Update gems --- Gemfile | 18 ++-- Gemfile.lock | 182 ++++++++++++++++++++------------------- test/fixtures/admins.yml | 2 +- 3 files changed, 103 insertions(+), 99 deletions(-) diff --git a/Gemfile b/Gemfile index 4d91fb4..92a4e0e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,13 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.0' +gem 'rails', '4.2.4' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0.1' +gem 'sass-rails', '~> 5.0.4' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '~> 2.7.0' +gem 'uglifier', '~> 2.7.2' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.1.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes @@ -19,7 +19,7 @@ gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' +gem 'jbuilder', '~> 2.3.1' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc @@ -29,19 +29,19 @@ gem 'web-console', '~> 2.0', group: :development gem 'quiet_assets', group: :development # Use Coveralls for coverage documentation -gem 'coveralls', '~> 0.7.2', require: false +gem 'coveralls', '~> 0.8.2', require: false -gem 'bootstrap-sass', '~> 3.3.1' +gem 'bootstrap-sass', '~> 3.3.5.1' gem 'autoprefixer-rails' -gem 'bh', '~> 1.3.1' +gem 'bh', '~> 1.3.4' -gem 'will_paginate', '~> 3.0.6' +gem 'will_paginate', '~> 3.0.7' gem 'will_paginate-bootstrap' gem 'mathjax-rails' -gem 'devise', '~> 3.4.1' +gem 'devise', '~> 3.5.2' gem 'devise-bootstrap-views' gem 'codemirror-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 82c220b..607a86f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,136 +1,139 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.0) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) - autoprefixer-rails (5.1.7) + arel (6.0.3) + autoprefixer-rails (6.0.2) execjs json bcrypt (3.1.10) - bh (1.3.1) + bh (1.3.4) actionpack activesupport binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.3) + bootstrap-sass (3.3.5.1) autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.2.19) + sass (>= 3.3.0) builder (3.2.2) - codemirror-rails (5.0) + codemirror-rails (5.6) railties (>= 3.0, < 5) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - coveralls (0.7.11) - multi_json (~> 1.10) + coffee-script-source (1.9.1.1) + coveralls (0.8.2) + json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) debug_inspector (0.0.2) - devise (3.4.1) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-bootstrap-views (0.0.4) + devise-bootstrap-views (0.0.5) docile (1.1.5) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.3.0) - ffi (1.9.6) - globalid (0.3.3) + execjs (2.6.0) + ffi (1.9.10) + globalid (0.3.6) activesupport (>= 4.1.0) - hike (1.2.3) + http-cookie (1.0.2) + domain_name (~> 0.5) i18n (0.7.0) - jbuilder (2.2.8) + jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (4.0.3) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.2) - loofah (2.0.1) + json (1.8.3) + loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mathjax-rails (2.3.0) + mathjax-rails (2.5.1) railties (>= 3.0) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.10.1) + minitest (5.8.0) + multi_json (1.11.2) netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.0) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -138,53 +141,54 @@ GEM json (~> 1.4) responders (2.1.0) railties (>= 4.2.0, < 5) - rest-client (1.7.3) + rest-client (1.8.0) ffi (~> 1.9) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - sass (3.4.13) - sass-rails (5.0.1) + sass (3.4.18) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - simplecov (0.9.2) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sprockets (3.3.4) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) - term-ansicolor (1.3.0) + term-ansicolor (1.3.2) tins (~> 1.0) thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.4) + thread_safe (0.3.5) + tilt (2.0.1) + tins (1.6.0) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - tzinfo-data (1.2015.1) + tzinfo-data (1.2015.6) tzinfo (>= 1.0.0) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) warden (1.2.3) rack (>= 1.0) - web-console (2.1.0) + web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -198,24 +202,24 @@ PLATFORMS DEPENDENCIES autoprefixer-rails - bh (~> 1.3.1) - bootstrap-sass (~> 3.3.1) + bh (~> 1.3.4) + bootstrap-sass (~> 3.3.5.1) codemirror-rails coffee-rails (~> 4.1.0) - coveralls (~> 0.7.2) - devise (~> 3.4.1) + coveralls (~> 0.8.2) + devise (~> 3.5.2) devise-bootstrap-views - jbuilder (~> 2.0) + jbuilder (~> 2.3.1) jquery-rails mathjax-rails quiet_assets - rails (= 4.2.0) - sass-rails (~> 5.0.1) + rails (= 4.2.4) + sass-rails (~> 5.0.4) sdoc (~> 0.4.0) sqlite3 turbolinks tzinfo-data - uglifier (~> 2.7.0) + uglifier (~> 2.7.2) web-console (~> 2.0) - will_paginate (~> 3.0.6) + will_paginate (~> 3.0.7) will_paginate-bootstrap diff --git a/test/fixtures/admins.yml b/test/fixtures/admins.yml index 813e227..3edd24e 100644 --- a/test/fixtures/admins.yml +++ b/test/fixtures/admins.yml @@ -7,4 +7,4 @@ admin: email: admin@example.com - encrypted_password: <%= Devise.bcrypt(Admin, 'password') %> \ No newline at end of file + encrypted_password: <%= Devise::Encryptor.digest(Admin, 'password') %> \ No newline at end of file From d551278d99048c95e950ade9d8677b85fa85bec8 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Wed, 9 Sep 2015 12:27:27 +0200 Subject: [PATCH 3/5] Update devise-bootstrap-views gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 607a86f..9cad272 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-bootstrap-views (0.0.5) + devise-bootstrap-views (0.0.6) docile (1.1.5) domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) From a4a7b766456c1d3dc20eaf751a723b7607094455 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Wed, 9 Sep 2015 12:27:59 +0200 Subject: [PATCH 4/5] Update ruby versions for travis build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3734bb8..abe318b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: ruby cache: bundler rvm: - - 2.1.5 + - 2.2.3 + - 2.1.7 - 1.9.3 script: - export RAILS_ENV=test From b4121af51b5074e329f09ebe0f48257c05356214 Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Wed, 9 Sep 2015 15:57:05 +0200 Subject: [PATCH 5/5] Fix #32: Add logo --- app/assets/images/favicon.ico | Bin 0 -> 2998 bytes app/views/layouts/application.html.erb | 1 + 2 files changed, 1 insertion(+) create mode 100644 app/assets/images/favicon.ico diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..cc2174c88ac808bb55c8465c9fb21615615df7bd GIT binary patch literal 2998 zcmeHJXHZnh7XDUI0e4+o1sUQDFfcIb&b@Q*%&?=d>#pMZ9?KF234$UF83AF)AZbVf zLq>)?YH1nDoGn8c%A8Y~Lz#0K(>4=JoLUeRAX3Us@nKNf1CME{4v9XAYi-T6HMSOfb z5)u-Sn3#y9q$DIKCnF^#1*xg2NJ~q@?Af!Co}P}3j0|LEW@65qImpV&LUwjGbUGb! za&nNHn~S`>Jmlx+qoAMwg@uJEDk?&8aWP6tN-%fsT$GlUqO7b8<>lq5sHi|?WhL}_ zJ*ujzP+eV(nwlEa*4Cn~t`76&%|m^CJsKJs(Ad}rgTa8NrY1BuH>0Jc1+A^EXlrXj zdwV-NIy%tV*@>>ME*OnQba!{7r>6(Ky}jt`>qCEkKL!Q{FgQ2}lgWey3l?DE!i8A0 zXb~1KUW_G6mSE}9rC7FX8I~_!juk6bVCBk{ShZ>uR*x5juR(N;N;1ZICbh2PMC@NB^qc-~%D@N< z^Wmc`?fFB^##wy_RjNuBk&)duarh4-9T~|u>oFEX&73?Oe;8_E@sqQq&+qEcsnl0j5AsC;@VevCVBeQZwnAwsM`4uP-Ud&rFL6 z4%OINICwd5KJ$wuBtyv=wVD|psH?8k>52+c0;cjty6~Mjj<)t=NlH#Ja^=s2G9W=) zRhFGsHMcm*$MgF!B6oMLEytE76)Gj8_N5ddaY-?AN=j?1%F-tjKiYZng*=XpjhrG? z3i@X?txoCe>eTD2>#B=#LMHHS?Z*+G&Kz5Ulq-}9p-Sl;7?m@x#!zq2XXS>nn||#-5gZUD$+)Qv?4!X%fM6kdlmw;qw1AF}|;Fep5@g z$uwxl2?>aciH+5SGJHpwgrddPZb6#hR+Fi%-pKZ&fvRxr?2OcG%`cvA4wOtmIa%@k z2o9WUGU*bGExo3mPVJ1?vgk<7c)ptxNzfF}+Cl9)Wm;Fu6hVA>=U{(tQetj;Qgno` zfX5{XMkeNPef-q^dhO)U%B~*Mps842SYMMAtK>U5QUpy(Z0uFzCne;j&Pp!nU<2$o zH02a#XK5%87alE>drj>UW08*6pRDFITxtFu%pk<+BB)GxKBp>5#5 zxT)XRT3K42Ji*J&*-0v4ai!GdcWq%)Yu^`qpuefSTsLdHi0{TFrE*5$&A6ze3tQSg zpPuD6^|l)-viwMiyDLv7BM6dFiufTpP4j!d_?tSK4He-MLgeA*Bo>QU3#GzY9$(fx z|4V?qO*Q2SjF(Wx8i>U*8A(#KoX12LHuf4j+dDd&4K;bcilic`z{5ohl1 zAZB22z}Vi`Q&&~ur;rI*Y7bXZMo7gZ<*ii8Wt#qh?!oz8&HA)IRFtPkC}J-M&60~K zil%6i_RT1$X{^kT_fykif|N%jDnVs3R>y?%LJvIB&F=OEbK1uk`Z!B zNiz&Xv)6zX3W_30LM-y~^b!dLLLou21*lRg7@Cxma&|C`icPpwEEWqr1)iRNQ(O7J XY5(`1V)j+PZ*Rj_Q}Ye@2V~$susw38 literal 0 HcmV?d00001 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fe74e24..0e7948a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,6 +2,7 @@ <%= t :site_title %> + <%= favicon_link_tag %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>