diff --git a/Gemfile b/Gemfile index d758b9b..b1b9cfe 100755 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ ruby '2.1.5' gem 'sqlite3' gem 'foreman' +gem 'crack', '0.3.1' # Pry for Rails, not in dev group in case running via prod/staging @ a training gem 'pry-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 078704d..b5686d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,12 @@ GEM coffee-script (2.3.0) coffee-script-source execjs +<<<<<<< HEAD coffee-script-source (1.9.0) +======= + coffee-script-source (1.8.0) + crack (0.3.1) +>>>>>>> b2c8e6cf8dbbaf33b548b62aba99aa9512322da9 cucumber (1.3.15) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -308,6 +313,7 @@ DEPENDENCIES bundler-audit capybara coffee-rails + crack (= 0.3.1) database_cleaner execjs foreman diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb old mode 100755 new mode 100644 index 8b351bf..cfa0921 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -22,5 +22,8 @@ class DashboardController < ApplicationController @user = current_user render :partial => "layouts/dashboard/dashboard_stats" end - + + def doc + render "../../doc/" + params[:doc] + end end diff --git a/app/views/dashboard/home.html.erb b/app/views/dashboard/home.html.erb old mode 100755 new mode 100644 index 5b0811a..cee5c39 --- a/app/views/dashboard/home.html.erb +++ b/app/views/dashboard/home.html.erb @@ -27,13 +27,15 @@ - +