diff --git a/Gemfile b/Gemfile index a592ff52..9f31bf59 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,8 @@ gem 'therubyracer', group: :therubyracer gem 'uglifier', '>=1.3.0' -gem 'jquery-rails' -gem 'jquery-ui-rails' +gem 'jquery-rails' , '~> 3.1.3' +gem 'jquery-ui-rails' , '~>5.0.5' # you may comment out the database driver(s) you will not be using. # This will prevent a native build of the driver. Building native drivers is not @@ -28,7 +28,7 @@ gem "RedCloth" gem "sanitize", ">=3.0.0" gem "will_paginate" gem "acts_as_list" -gem "aasm" +gem "aasm", '~> 3.4.0' gem "htmlentities" gem "swf_fu" gem "rails_autolink" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 633bbbdc..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,317 +0,0 @@ -GIT - remote: https://github.com/rails/rails-dom-testing - revision: a64f30514ee65f172c43f42cfd4500b5e11a561a - ref: a64f30514ee65f172c43f42cfd4500b5e11a561a - specs: - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - aasm (4.12.3) - concurrent-ruby (~> 1.0) - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionpack-xml_parser (1.0.2) - actionpack (>= 4.0.0, < 5) - actionview (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts_as_list (0.9.15) - activerecord (>= 3.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - ast (2.4.0) - autoprefixer-rails (9.0.0) - execjs - bcrypt (3.1.12) - bootstrap-sass (3.3.3) - autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.2.19) - builder (3.2.3) - bullet (5.7.5) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) - capybara (2.18.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - climate_control (0.2.0) - codeclimate-test-reporter (1.0.7) - simplecov - coderay (1.1.2) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - crass (1.0.4) - daemons (1.2.6) - database_cleaner (1.7.0) - diff-lcs (1.3) - docile (1.3.1) - erubis (2.7.0) - eventmachine (1.2.7) - execjs (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - ffi (1.9.25) - font-awesome-sass (4.5.0) - sass (>= 3.2) - globalid (0.4.1) - activesupport (>= 4.2.0) - htmlentities (4.3.4) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - jaro_winkler (1.5.1) - jquery-rails (4.3.3) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) - json (2.1.0) - libv8 (3.16.14.19) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - method_source (0.9.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_mime (1.0.0) - mini_portile2 (2.1.0) - minitest (5.11.3) - minitest-stub-const (0.6) - mocha (1.6.0) - metaclass (~> 0.0.1) - mysql2 (0.3.21) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - nokogumbo (1.5.0) - nokogiri - paperclip (6.0.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.0.2) - rack (1.6.10) - rack-dev-mark (0.7.7) - rack (>= 1.1, < 2.1) - rack-mini-profiler (1.0.0) - rack (>= 1.2.0) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - rails_autolink (1.1.6) - rails (> 3.1) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - ref (2.0.0) - rspec-expectations (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - rubocop (0.58.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - rubyzip (1.2.1) - safe_yaml (1.0.4) - sanitize (4.6.6) - crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) - sass (3.5.7) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - selenium-webdriver (2.53.4) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - spring (2.0.2) - activesupport (>= 4.2) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - swf_fu (2.0.4) - coffee-script - rails (>= 3.1) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref - thin (1.7.2) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.20.0) - thread_safe (0.3.6) - tilt (2.0.8) - tolk (1.9.3) - rails (>= 4.0, < 4.3) - safe_yaml (>= 0.8.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - uglifier (4.1.16) - execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.0) - uniform_notifier (1.11.0) - websocket (1.2.8) - will_paginate (3.1.6) - xpath (2.1.0) - nokogiri (~> 1.3) - yard (0.9.15) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth - aasm - actionpack-xml_parser (>= 1.0.1) - acts_as_list - bcrypt (~> 3.1.7) - bootstrap-sass (= 3.3.3) - bullet - capybara - codeclimate-test-reporter - coffee-rails (~> 4.1.0) - database_cleaner - factory_girl_rails - font-awesome-sass (~> 4.5.0) - htmlentities - jquery-rails - jquery-ui-rails - minitest-stub-const - mocha - mysql2 (~> 0.3.17) - paperclip - pry - rack-dev-mark - rack-mini-profiler - rails (~> 4.2.6) - rails-dom-testing! - rails_autolink - rspec-expectations - rubocop (~> 0.49) - sanitize (>= 3.0.0) - sass-rails (~> 5.0) - selenium-webdriver (~> 2.53) - simplecov - spring - sqlite3 - swf_fu - therubyracer - thin - tolk (~> 1.9.3) - uglifier (>= 1.3.0) - will_paginate - yard - -BUNDLED WITH - 1.16.2