diff --git a/Gemfile b/Gemfile index cae686400..b5dddab75 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' ruby '2.3.3' -gem 'rails', '4.2.5' +gem 'rails', '4.2.9' gem 'figaro' gem 'pg' gem 'devise', '3.5.6' diff --git a/Gemfile.lock b/Gemfile.lock index 40a51e8f3..47d4d3d2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,65 +8,62 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.8) + activesupport (= 4.2.8) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.8) + activesupport (= 4.2.8) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.8) + activesupport (= 4.2.8) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.8) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) ajax-datatables-rails (0.3.1) railties (>= 3.1) - algorithms (0.6.1) ansi (1.5.0) - arel (6.0.3) + arel (6.0.4) aspector (0.14.0) ast (2.3.0) auto_strip_attributes (2.1.0) activerecord (>= 3.0) - autoprefixer-rails (6.1.2) + autoprefixer-rails (7.1.1.2) execjs - json autosize-rails (1.18.17) rails (>= 3.1) - awesome_print (1.7.0) - aws-sdk (2.2.8) - aws-sdk-resources (= 2.2.8) - aws-sdk-core (2.2.8) + awesome_print (1.8.0) + aws-sdk (2.2.37) + aws-sdk-resources (= 2.2.37) + aws-sdk-core (2.2.37) jmespath (~> 1.0) - aws-sdk-resources (2.2.8) - aws-sdk-core (= 2.2.8) - aws-sdk-v1 (1.66.0) + aws-sdk-resources (2.2.37) + aws-sdk-core (= 2.2.37) + aws-sdk-v1 (1.67.0) json (~> 1.4) - nokogiri (>= 1.4.4) + nokogiri (~> 1) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -79,41 +76,39 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap-select-rails (1.6.3) + bootstrap-select-rails (1.12.1) bootstrap3-datetimepicker-rails (4.15.35) momentjs-rails (>= 2.8.1) - bootstrap_form (2.3.0) - builder (3.2.2) - byebug (8.2.1) - climate_control (0.0.3) - activesupport (>= 3.0) + bootstrap_form (2.7.0) + builder (3.2.3) + byebug (9.0.6) + climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - coffee-rails (4.1.0) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - colorize (0.8.1) + coffee-script-source (1.12.2) commit_param_routing (0.0.1) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.5) crass (1.0.2) - debug_inspector (0.0.2) - deface (1.0.2) - colorize (>= 0.5.8) - nokogiri (~> 1.6.0) + debug_inspector (0.0.3) + deface (1.2.0) + nokogiri (~> 1.6) polyglot - rails (>= 3.1) - delayed_job (4.1.1) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.1.0) - activerecord (>= 3.0, < 5) + rails (>= 4.1) + rainbow (>= 2.1.0) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) delayed_paperclip (3.0.1) activejob (>= 4.2) @@ -125,31 +120,31 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.10.1) - devise (~> 3.2) - devise_invitable (1.5.5) - actionmailer (>= 3.2.6, < 5) + devise-async (0.10.2) + devise (>= 3.2, < 4.0) + devise_invitable (1.6.1) + actionmailer (>= 3.2.6) devise (>= 3.2.0) erubis (2.7.0) - execjs (2.6.0) - faker (1.6.1) + execjs (2.7.0) + faker (1.7.3) i18n (~> 0.5) figaro (1.1.1) thor (~> 0.14) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - globalid (0.3.6) - activesupport (>= 4.1.0) + font-awesome-rails (4.7.0.2) + railties (>= 3.2, < 5.2) + globalid (0.4.0) + activesupport (>= 4.2.0) hammerjs-rails (2.0.4) - i18n (0.7.0) - i18n-js (3.0.0.rc11) - i18n (~> 0.6) + i18n (0.8.4) + i18n-js (3.0.0) + i18n (~> 0.6, >= 0.6.6) introjs-rails (1.0.0) sass-rails (>= 3.2) thor (~> 0.14) - jmespath (1.1.3) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jmespath (1.3.1) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) @@ -157,78 +152,87 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - js_cookie_rails (1.0.1) + js_cookie_rails (2.1.4) railties (>= 3.1) - json (1.8.3) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + json (1.8.6) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) + lazy_priority_queue (0.1.1) little-plugger (1.1.4) logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.6) + mime-types (>= 1.16, < 4) mime-types (1.25.1) mimemagic (0.3.0) - mini_portile2 (2.1.0) - minitest (5.9.0) - minitest-reporters (1.1.10) + mini_portile2 (2.2.0) + minitest (5.10.2) + minitest-reporters (1.1.14) ansi builder minitest (>= 5.0) ruby-progressbar - momentjs-rails (2.10.6) + momentjs-rails (2.17.1) railties (>= 3.1) - multi_json (1.11.2) - nested_form_fields (0.7.4) + multi_json (1.12.1) + nested_form_fields (0.8) coffee-rails (>= 3.2.1) jquery-rails rails (>= 3.2.0) - newrelic_rpm (4.0.0.332) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nokogumbo (1.4.10) + newrelic_rpm (4.2.0.334) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + nokogumbo (1.4.13) nokogiri - oj (2.17.4) + oj (2.18.5) orm_adapter (0.5.0) - paperclip (4.3.2) + paperclip (4.3.7) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) + parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) - pg (0.18.4) - pkg-config (1.1.7) + pg (0.21.0) polyglot (0.3.5) powerpack (0.1.1) - puma (2.15.3) - rack (1.6.4) + puma (3.9.1) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.8) + actionmailer (= 4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + activemodel (= 4.2.8) + activerecord (= 4.2.8) + activesupport (= 4.2.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.8) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) @@ -237,101 +241,103 @@ GEM rails_stdout_logging rails_autolink (1.1.6) rails (> 3.1) - rails_serve_static_assets (0.0.4) - rails_stdout_logging (0.0.4) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake rake (12.0.0) - rdoc (4.2.0) - recaptcha (4.0.0) + rdoc (4.3.0) + recaptcha (4.3.1) json - remotipart (1.2.1) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rgl (0.5.1) - algorithms (~> 0.6.1) + remotipart (1.3.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rgl (0.5.3) + lazy_priority_queue (~> 0.1.0) stream (~> 0.5.0) rkelly-remix (0.0.7) roo (2.1.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) - rubocop (0.48.1) + rubocop (0.49.1) + parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-graphviz (1.2.2) + ruby-graphviz (1.2.3) ruby-progressbar (1.8.1) - rubyzip (1.1.7) - sanitize (4.4.0) + rubyzip (1.2.1) + sanitize (4.5.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.23) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.4.24) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scss_lint (0.53.0) + scss_lint (0.54.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - shoulda-context (1.2.1) + shoulda-context (1.2.2) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) silencer (1.0.1) - simple_token_authentication (1.14.0) + simple_token_authentication (1.15.1) actionmailer (>= 3.2.6, < 6) actionpack (>= 3.2.6, < 6) devise (>= 3.2, < 6) - skylight (0.10.0) + skylight (1.3.1) activesupport (>= 3.0.0) sourcemap (0.1.1) spinjs-rails (1.4) rails (>= 3.1) - sprockets (3.5.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - starscope (1.5.3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + starscope (1.5.5) babel-transpiler (~> 0.7) oj (~> 2.9) - parser (>= 2.2.2) + parser (~> 2.3) rkelly-remix (~> 0.0.7) - ruby-progressbar (~> 1.5) + ruby-progressbar (~> 1.8) sourcemap (~> 0.1) stream (0.5) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.1) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) tinymce-rails (4.5.7) railties (>= 3.1.1) - turbolinks (2.5.3) - coffee-rails - tzinfo (1.2.2) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) underscore-rails (1.8.3) - unicode-display_width (1.2.1) - warden (1.2.6) + unicode-display_width (1.3.0) + warden (1.2.7) rack (>= 1.0) - wicked_pdf (1.0.3) - wkhtmltopdf-heroku (2.12.3.0) + wicked_pdf (1.1.0) + wkhtmltopdf-heroku (2.12.4.0) yomu (0.2.4) json (~> 1.8) mime-types (~> 1.23) @@ -384,7 +390,7 @@ DEPENDENCIES paperclip (~> 4.3) pg puma - rails (= 4.2.5) + rails (= 4.2.8) rails_12factor rails_autolink (~> 1.1, >= 1.1.6) recaptcha diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index 0a3b2f08b..240899728 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -8,9 +8,9 @@ //= require jquery.scrollTo //= require jquery.autosize //= require jquery-ui/widget -//= require jquery-ui/mouse -//= require jquery-ui/draggable -//= require jquery-ui/droppable +//= require jquery-ui/widgets/mouse +//= require jquery-ui/widgets/draggable +//= require jquery-ui/widgets/droppable //= require jquery.ui.touch-punch.min //= require jquery.caret.min //= require jquery.atwho.min diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index f60e0e0d9..2b43035e9 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -1,4 +1,4 @@ -//= require jquery-ui/sortable +//= require jquery-ui/widgets/sortable // Extend datatables API with searchable options // (http://stackoverflow.com/questions/39912395/datatables-dynamically-set-columns-searchable) diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb index 62bdf2428..e413af124 100644 --- a/app/assets/javascripts/samples/sample_datatable.js.erb +++ b/app/assets/javascripts/samples/sample_datatable.js.erb @@ -1,4 +1,4 @@ -//= require jquery-ui/sortable +//= require jquery-ui/widgets/sortable // Extend datatables API with searchable options // (http://stackoverflow.com/questions/39912395/datatables-dynamically-set-columns-searchable)