summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock124
-rw-r--r--app/assets/javascripts/dispatcher.js.coffee2
3 files changed, 65 insertions, 65 deletions
diff --git a/Gemfile b/Gemfile
index 63b64b62421..e9c62e5c5b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup'
gem "asciidoctor"
# Servers
-gem "puma", '~> 2.0.1'
+gem "puma", '~> 2.1.1'
# State machine
gem "state_machine"
@@ -168,7 +168,7 @@ group :development, :test do
gem 'factory_girl_rails'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest'
+ gem 'minitest', '~> 4.7.0'
# Generate Fake data
gem "ffaker"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8063ae184e3..2ced4eef514 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/ctran/annotate_models.git
- revision: 8bd159c7a484093fde84beaa9e6398f25ddacf09
+ revision: 18a4e2eb77c8f3ef695b563e4a7ca45dfede819b
specs:
- annotate (2.6.0.beta1)
+ annotate (2.6.0.beta2)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
@@ -42,20 +42,20 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
- acts-as-taggable-on (2.4.0)
- rails (~> 3.0)
+ acts-as-taggable-on (2.4.1)
+ rails (>= 3, < 5)
addressable (2.3.4)
arel (3.0.2)
asciidoctor (0.1.3)
awesome_print (1.1.0)
- backports (2.6.7)
+ backports (3.3.2)
bcrypt-ruby (3.0.1)
- better_errors (0.8.0)
+ better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
- binding_of_caller (0.7.1)
+ binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (2.3.1.0)
+ bootstrap-sass (2.3.2.0)
sass (~> 3.2)
builder (3.0.4)
capybara (2.1.0)
@@ -67,7 +67,7 @@ GEM
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- celluloid (0.14.0)
+ celluloid (0.14.1)
timers (>= 1.0.0)
charlock_holmes (0.6.9.4)
childprocess (0.3.9)
@@ -75,7 +75,7 @@ GEM
chosen-rails (0.9.8)
railties (~> 3.0)
thor (~> 0.14)
- code_analyzer (0.3.1)
+ code_analyzer (0.3.2)
sexp_processor
coderay (1.0.9)
coffee-rails (3.2.2)
@@ -87,15 +87,16 @@ GEM
coffee-script-source (1.6.2)
colored (1.2)
colorize (0.5.8)
- connection_pool (1.0.0)
+ connection_pool (1.1.0)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
thor
- crack (0.3.2)
- d3_rails (3.1.4)
+ crack (0.4.0)
+ safe_yaml (~> 0.9.0)
+ d3_rails (3.1.10)
railties (>= 3.1.0)
daemons (1.1.9)
database_cleaner (1.0.1)
@@ -107,11 +108,11 @@ GEM
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.2.4)
- dotenv (0.7.0)
+ dotenv (0.8.0)
email_spec (1.4.0)
launchy (~> 2.1)
mail (~> 2.2)
- enumerize (0.5.1)
+ enumerize (0.6.1)
activesupport (>= 3.2)
erubis (2.7.0)
escape_utils (0.2.4)
@@ -129,8 +130,8 @@ GEM
faraday (>= 0.7.4, < 0.9)
faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
- ffaker (1.16.0)
- ffi (1.8.1)
+ ffaker (1.16.1)
+ ffi (1.9.0)
font-awesome-rails (3.1.1.3)
railties (>= 3.2, < 5.0)
foreman (0.63.0)
@@ -174,7 +175,7 @@ GEM
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
- gon (4.1.0)
+ gon (4.1.1)
actionpack (>= 2.3.0)
json
grape (0.4.1)
@@ -191,19 +192,19 @@ GEM
activesupport
multi_json (>= 1.3.2)
growl (1.0.3)
- guard (1.8.0)
+ guard (1.8.1)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-rspec (3.0.0)
+ guard-rspec (3.0.2)
guard (>= 1.8)
rspec (~> 2.13)
guard-spinach (0.0.2)
guard (>= 1.1)
spinach
- haml (4.0.2)
+ haml (4.0.3)
tilt
haml-rails (0.4)
actionpack (>= 3.1, < 4.1)
@@ -211,9 +212,10 @@ GEM
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hashie (1.2.0)
- hike (1.2.2)
+ hike (1.2.3)
hipchat (0.9.0)
httparty
+ httparty
http_parser.rb (0.5.3)
httparty (0.11.0)
multi_json (~> 1.0)
@@ -243,18 +245,17 @@ GEM
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- launchy (2.2.0)
+ launchy (2.3.0)
addressable (~> 2.3)
- letter_opener (1.1.0)
- launchy (~> 2.2.0)
+ letter_opener (1.1.1)
+ launchy (~> 2.2)
libv8 (3.11.8.17)
- listen (1.1.3)
+ listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.3)
- mail (2.5.3)
- i18n (>= 0.4.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
@@ -262,12 +263,12 @@ GEM
minitest (4.7.4)
modernizr (2.6.2)
sprockets (~> 2.0)
- multi_json (1.7.3)
- multi_xml (0.5.3)
+ multi_json (1.7.7)
+ multi_xml (0.5.4)
multipart-post (1.2.0)
mysql2 (0.3.11)
net-ldap (0.3.1)
- nokogiri (1.5.9)
+ nokogiri (1.5.10)
oauth (0.4.7)
oauth2 (0.8.1)
faraday (~> 0.8)
@@ -281,7 +282,7 @@ GEM
omniauth-github (1.1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
- omniauth-google-oauth2 (0.1.17)
+ omniauth-google-oauth2 (0.1.19)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth (1.0.1)
@@ -290,7 +291,7 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- omniauth-twitter (0.0.16)
+ omniauth-twitter (0.0.17)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
@@ -305,7 +306,7 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- puma (2.0.1)
+ puma (2.1.1)
rack (>= 1.1, < 2.0)
pygments.rb (0.4.2)
posix-spawn (~> 0.3.6)
@@ -339,7 +340,7 @@ GEM
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
- rails_best_practices (1.13.4)
+ rails_best_practices (1.13.8)
activesupport
awesome_print
code_analyzer
@@ -354,7 +355,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.4)
+ rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
@@ -382,7 +383,7 @@ GEM
redis-store (~> 1.1.0)
redis-store (1.1.3)
redis (>= 2.2.0)
- ref (1.0.4)
+ ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.13.0)
@@ -393,16 +394,17 @@ GEM
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
- rspec-rails (2.13.1)
+ rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
- ruby-progressbar (1.0.2)
+ ruby-progressbar (1.1.1)
rubyntlm (0.1.1)
rubyzip (0.9.9)
+ safe_yaml (0.9.3)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.9)
@@ -416,10 +418,10 @@ GEM
seed-fu (2.2.0)
activerecord (~> 3.1)
activesupport (~> 3.1)
- select2-rails (3.3.1)
- sass-rails (>= 3.2)
+ select2-rails (3.4.2)
+ sass-rails
thor (~> 0.14)
- selenium-webdriver (2.32.1)
+ selenium-webdriver (2.33.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@@ -428,8 +430,8 @@ GEM
sexp_processor (4.2.1)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
- sidekiq (2.12.0)
- celluloid (>= 0.14.0)
+ sidekiq (2.12.4)
+ celluloid (>= 0.14.1)
connection_pool (>= 1.0.0)
json
redis (>= 3.0)
@@ -439,23 +441,23 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- sinatra (1.3.6)
+ sinatra (1.4.3)
rack (~> 1.4)
- rack-protection (~> 1.3)
- tilt (~> 1.3, >= 1.3.3)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
six (0.2.0)
- slim (1.3.8)
- temple (~> 0.6.3)
- tilt (~> 1.3.3)
+ slim (2.0.0)
+ temple (~> 0.6.5)
+ tilt (~> 1.3, >= 1.3.3)
slop (3.4.5)
- spinach (0.8.2)
+ spinach (0.8.3)
colorize (= 0.5.8)
gherkin-ruby (~> 0.3.0)
spinach-rails (0.2.1)
capybara (>= 2.0.0)
railties (>= 3)
spinach (>= 0.4)
- spork (1.0.0rc3)
+ spork (1.0.0rc2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -464,7 +466,7 @@ GEM
stamp (0.5.0)
state_machine (1.2.0)
stringex (1.5.1)
- temple (0.6.4)
+ temple (0.6.5)
test_after_commit (0.2.0)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
@@ -474,7 +476,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
- tilt (1.3.7)
+ tilt (1.4.1)
timers (1.1.0)
tinder (1.9.2)
eventmachine (~> 1.0)
@@ -485,22 +487,22 @@ GEM
mime-types (~> 1.19)
multi_json (~> 1.5)
twitter-stream (~> 0.1)
- treetop (1.4.12)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
- turbolinks (1.1.1)
+ turbolinks (1.2.0)
coffee-rails
twitter-stream (0.1.16)
eventmachine (>= 0.12.8)
http_parser.rb (~> 0.5.1)
simple_oauth (~> 0.1.4)
tzinfo (0.3.37)
- uglifier (2.0.1)
+ uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
underscore-rails (1.4.4)
- virtus (0.5.4)
- backports (~> 2.6.1)
+ virtus (0.5.5)
+ backports (~> 3.3)
descendants_tracker (~> 0.0.1)
warden (1.2.1)
rack (>= 1.0)
@@ -564,7 +566,7 @@ DEPENDENCIES
kaminari (~> 0.14.1)
launchy
letter_opener
- minitest
+ minitest (~> 4.7.0)
modernizr (= 2.6.2)
mysql2
omniauth (~> 1.1.3)
@@ -574,7 +576,7 @@ DEPENDENCIES
pg
poltergeist (~> 1.3.0)
pry
- puma (~> 2.0.1)
+ puma (~> 2.1.1)
quiet_assets (~> 1.0.1)
rack-mini-profiler
rails (= 3.2.13)
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 8ce13e6851e..245b707626d 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -10,8 +10,6 @@ class Dispatcher
page = $('body').attr('data-page')
project_id = $('body').attr('data-project-id')
- console.log(page)
-
unless page
return false
View Lorry Controller Status