diff --git a/.ruby-version b/.ruby-version index c82eec7..7ec1d6d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3-p448 +2.1.0 diff --git a/.travis.yml b/.travis.yml index 028cd15..d57fc29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: + - "2.1.0" - "1.9.3" services: redis-server env: diff --git a/Gemfile b/Gemfile index 31f2643..dedcdcf 100644 --- a/Gemfile +++ b/Gemfile @@ -4,16 +4,11 @@ gem 'rails_config' gem 'therubyracer' gem 'sass-rails' gem 'uglifier' -gem 'coffee-rails' gem 'gon' gem 'color' gem 'redis' -gem 'coveralls', require: false, group: :test -gem 'simplecov', '~> 0.7.1' -gem 'sinatra' - gem "git-version-bump" group :production do @@ -31,6 +26,9 @@ group :development do gem "rspec-rails" gem "selenium-webdriver" gem "sinatra-reloader" + gem 'coveralls', require: false + gem 'simplecov', '~> 0.7.1' + gem 'sinatra' end group :debugging do diff --git a/Gemfile.lock b/Gemfile.lock index 0d7c727..4ec56d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,13 +49,6 @@ GEM childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) - coffee-rails (4.0.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) - coffee-script-source - execjs - coffee-script-source (1.7.0) color (1.7) columnize (0.8.9) coveralls (0.7.0) @@ -257,7 +250,6 @@ DEPENDENCIES binding_of_caller capybara capybara-webkit - coffee-rails color coveralls git-version-bump diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png deleted file mode 100644 index ecc07ce..0000000 Binary files a/app/assets/images/logo.png and /dev/null differ diff --git a/app/assets/images/tooltip.png b/app/assets/images/tooltip.png deleted file mode 100644 index e33422d..0000000 Binary files a/app/assets/images/tooltip.png and /dev/null differ diff --git a/app/assets/images/waiting.gif b/app/assets/images/waiting.gif deleted file mode 100644 index c101053..0000000 Binary files a/app/assets/images/waiting.gif and /dev/null differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b60f300..93eea47 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,7 +11,7 @@ // about supported directives. // //= require jquery-1.10.2.min -//= require jquery-ui.1.10.3.min +//= require jquery-ui.min //= require bootstrap.min //= require sb-admin //= require jquery.metisMenu diff --git a/app/views/graphs/stacked.html.erb b/app/views/graphs/stacked.html.erb index fa267cc..dbaf782 100644 --- a/app/views/graphs/stacked.html.erb +++ b/app/views/graphs/stacked.html.erb @@ -1,9 +1,7 @@ <%= javascript_include_tag "rickshaw" %> <%= stylesheet_link_tag "graphs/stacked" %> - -<% if dckx %> -<%= stylesheet_link_tag "graphs/dckx" %> -<%end%> +<%= javascript_include_tag "graphs/stacked.js" %> +<%= stylesheet_link_tag "graphs/dckx" if dckx %>