From 5ed2de3ab068bf67f25968fd773cd421ef3ba055 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 25 Jun 2014 22:09:45 +0200 Subject: [PATCH 1/2] remove custom solution to visually show that you are running in development environment and replace with rack-dev-mark gem --- Gemfile | 1 + app/assets/images/construction.gif | Bin 1087 -> 0 bytes app/assets/stylesheets/tracks.css.scss | 6 ------ app/views/layouts/application.html.erb | 2 -- config/environments/development.rb | 2 +- 5 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 app/assets/images/construction.gif diff --git a/Gemfile b/Gemfile index fb136b6a..df58a866 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem "htmlentities" gem "swf_fu" gem "rails_autolink" gem "cache_digests" +gem "rack-dev-mark" # To use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.7' diff --git a/app/assets/images/construction.gif b/app/assets/images/construction.gif deleted file mode 100644 index 95ef4e6274b446a2416df847338dcfb2b3dd3a1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1087 zcmX9-ZD^Hs6#rF|Mj}DcinjC=SSg0RK#N9pg5`EKs5YF~W}S#Oq3uKTX144UmXt*F zAxhJAdT|3Ibpwl{+db(P5|kezBH8kUkyIEKq92sq&foshA<=oaM(~p!jZ5jzyS$p zzycnq*MS0)xlCp){n$$uCrTn_Vj)&yBX;5-&fE;=5oTpJW@nCUAWTxCBCNtD?7|_O zBuPuED66t5yK*QebFxw|#%gTFZXCub2YG2K&gyK=?i|jk5e4TY3D#f>_TUIc5jfka z6nWGN>Ex%W8c~@oq)KX}P8y^rYziPLaB^}E$$pypk`$C8s-h<9q9NHbt1~fUYO1ap zs%Zn6CK<_)shPTIn5H-6nhYiLT+P*8!!-?~(4;L{9BQE+8lfmlk=)YiOiBaOtF)z9 zNK}LnDjkj7$%E3FG@+;?T*g?@CS@pQlN8BB%4`#N@sLy^NhiOgQUIB{Yfdg}K~}^S zD=5vpe&&SPN2*#jqW=G4D+5~q4Sc(eFyixe_-=P7q8gf z`43HQx#H@c>4W3)%^TGA+H~W@Z&Pnxzi?aM&o}N|`O=a{t{tv)_usQ^>CnXF*6y*& z$fDp15H;w@b9`Gb}qWNr+4egfkS)N9+-1S^R2yyKO6dR zs@mJS=9lWD$C~E1JT-W9->dag^P1K_@%y2-Iy#nZ-|+a4W8-7})x(32{q@u53kNQ* s%{=$a_>p}JR=?MB_Q_Mnf8E@A=g7uqPadm|URN7=VYq(5oCdW02Qi7u0ssI2 diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index 0aba6569..467c4c40 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -277,12 +277,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url a:hover { color: #CCC; } } -#develop-notify-bar { - line-height:0.5; - background-image: image-url('construction.gif'); - background-repeat: repeat-x; -} - #topbar { position: fixed; top: 0px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2630f6c7..dfce64c3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,8 +35,6 @@
- <%= NOTIFY_BAR.html_safe %> -

<% if @count -%> diff --git a/config/environments/development.rb b/config/environments/development.rb index 6df6a80f..6a02431e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -26,6 +26,6 @@ Rails.application.configure do # config.action_controller.session_store :cookie_store, :key => 'TracksCucumber' # config.action_controller.session = { :key => 'TracksDev' } - NOTIFY_BAR="
 
" + config.rack_dev_mark.enable = true end From 6012c49fa24d7ba419bc50e3270dbe4329f45fc1 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 26 Jun 2014 10:14:00 +0200 Subject: [PATCH 2/2] move rack-dev-mark gem to development group --- Gemfile | 2 +- Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index df58a866..6b1d6c77 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,6 @@ gem "htmlentities" gem "swf_fu" gem "rails_autolink" gem "cache_digests" -gem "rack-dev-mark" # To use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.7' @@ -49,6 +48,7 @@ group :development do gem 'tolk', '>=1.5.0' gem "bullet" gem "rack-mini-profiler" + gem "rack-dev-mark" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 09bc490f..67c39a20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,8 @@ GEM nokogiri polyglot (0.3.5) rack (1.5.2) + rack-dev-mark (0.4.5) + rack (>= 1.1) rack-mini-profiler (0.9.1) rack (>= 1.1.3) rack-test (0.6.2) @@ -226,6 +228,7 @@ DEPENDENCIES jquery-rails mocha mysql2 + rack-dev-mark rack-mini-profiler rails (~> 4.1.0) rails_autolink