diff --git a/Gemfile.lock b/Gemfile.lock index 2155f14c..1836259f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/cucumber/aruba - revision: e4a17189e33f80a93ab75d4f96222048f98efdd2 + revision: fccb412d18d699b7ecacd0da6b2e5338987cf4eb specs: aruba (0.5.4) childprocess (>= 0.3.6) @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/tolk/tolk - revision: da2888c181493027a68f04ba7e2b9060883cc464 + revision: 06f99b3b747f2f8f7297fa35ec9c9d5f38eaada6 specs: tolk (1.4.00) safe_yaml (~> 0.8) @@ -27,26 +27,26 @@ GEM specs: RedCloth (4.2.9) aasm (3.1.1) - actionmailer (4.0.3) - actionpack (= 4.0.3) + actionmailer (4.0.4) + actionpack (= 4.0.4) mail (~> 2.5.4) - actionpack (4.0.3) - activesupport (= 4.0.3) + actionpack (4.0.4) + activesupport (= 4.0.4) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.3) - activesupport (= 4.0.3) + activemodel (4.0.4) + activesupport (= 4.0.4) builder (~> 3.1.0) - activerecord (4.0.3) - activemodel (= 4.0.3) + activerecord (4.0.4) + activemodel (= 4.0.4) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.3) + activesupport (= 4.0.4) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.3) - i18n (~> 0.6, >= 0.6.4) + activesupport (4.0.4) + i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -54,7 +54,7 @@ GEM acts_as_list (0.4.0) activerecord (>= 3.0) arel (4.0.2) - atomic (1.1.15) + atomic (1.1.16) bcrypt-ruby (3.0.1) builder (3.1.4) bullet (4.8.0) @@ -69,7 +69,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.1) + childprocess (0.5.2) ffi (~> 1.0, >= 1.0.11) codeclimate-test-reporter (0.3.0) simplecov (>= 0.7.1, < 1.0.0) @@ -81,12 +81,12 @@ GEM execjs coffee-script-source (1.7.0) commonjs (0.2.7) - cucumber (1.3.11) + cucumber (1.3.14) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.0.2) + multi_test (>= 0.1.1) cucumber-rails (1.4.0) capybara (>= 1.1.2) cucumber (>= 1.2.0) @@ -113,62 +113,63 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - less (2.4.0) + less (2.5.0) commonjs (~> 0.2.7) - less-rails (2.4.2) + less-rails (2.5.0) actionpack (>= 3.1) - less (~> 2.4.0) + less (~> 2.5.0) libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.4) mime-types (1.25.1) - mini_portile (0.5.2) + mini_portile (0.5.3) minitest (4.7.5) mocha (1.0.0) metaclass (~> 0.0.1) mousetrap-rails (1.4.6) - multi_json (1.9.0) - multi_test (0.0.3) + multi_json (1.9.2) + multi_test (0.1.1) mysql2 (0.3.15) nokogiri (1.6.1) mini_portile (~> 0.5.0) polyglot (0.3.4) - protected_attributes (1.0.5) + protected_attributes (1.0.7) activemodel (>= 4.0.1, < 5.0) rack (1.5.2) - rack-mini-profiler (0.9.0) + rack-mini-profiler (0.9.1) rack (>= 1.1.3) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.3) - actionmailer (= 4.0.3) - actionpack (= 4.0.3) - activerecord (= 4.0.3) - activesupport (= 4.0.3) + rails (4.0.4) + actionmailer (= 4.0.4) + actionpack (= 4.0.4) + activerecord (= 4.0.4) + activesupport (= 4.0.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.3) + railties (= 4.0.4) sprockets-rails (~> 2.0.0) rails_autolink (1.1.5) rails (> 3.1) - railties (4.0.3) - actionpack (= 4.0.3) - activesupport (= 4.0.3) + railties (4.0.4) + actionpack (= 4.0.4) + activesupport (= 4.0.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (10.2.2) ref (1.0.5) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rubyzip (1.1.0) + rubyzip (1.1.2) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.14) - sass-rails (4.0.1) + sass (3.2.18) + sass-rails (4.0.2) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0.0) selenium-webdriver (2.40.0) childprocess (>= 0.5.0) @@ -196,8 +197,8 @@ GEM therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.18.1) - thread_safe (0.2.0) + thor (0.19.1) + thread_safe (0.3.1) atomic (>= 1.1.7, < 2) tilt (1.4.1) timecop (0.6.3) @@ -211,8 +212,8 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.38) - uglifier (2.4.0) + tzinfo (0.3.39) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) uniform_notifier (1.4.0) @@ -222,7 +223,7 @@ GEM will_paginate (>= 3.0.3) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.7.3) + yard (0.8.7.4) PLATFORMS ruby diff --git a/app/assets/javascripts/tracks.js.coffee.erb b/app/assets/javascripts/tracks.js.coffee.erb index 9a627c5c..6b69ba81 100644 --- a/app/assets/javascripts/tracks.js.coffee.erb +++ b/app/assets/javascripts/tracks.js.coffee.erb @@ -6,14 +6,14 @@ TracksApp = title: "Go to project" placeholder: "Type (part of) project name" autocomplete_link: "<%= Rails.application.routes.url_helpers.projects_path(format: :autocomplete) %>" - target_link: "<%= Rails.application.routes.url_helpers.project_path "" %>" + target_link: "<%= Rails.application.routes.url_helpers.project_path(1)[0..-2] %>" # remove id 1 from path target_id: "id" # json/datum field containing id to use } context: { title: "Go to context" placeholder: "Type (part of) context name" autocomplete_link: "<%= Rails.application.routes.url_helpers.contexts_path(format: :autocomplete) %>" - target_link: "<%= Rails.application.routes.url_helpers.context_path ""%>" + target_link: "<%= Rails.application.routes.url_helpers.context_path(1)[0..-2] %>" # remove id 1 from path target_id: "id" # json/datum field containing id to use } tag: {