Merge branch 'release/0.5.2.0' into stable

53c3ef1d · Dennis Schubert · 5ca9ca98 · b707ec96 · 53c3ef1d · 53c3ef1d
Commit 53c3ef1d authored Jul 20, 2015 by Dennis Schubert
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 19 deletions

Gemfile Gemfile +5 -6

Gemfile.lock Gemfile.lock +10 -12

app/assets/javascripts/main.js app/assets/javascripts/main.js +0 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -92,22 +92,21 @@ gem "js-routes",         "1.0.1"
 source "https://rails-assets.org" do
  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails

-  gem "rails-assets-markdown-it",                         "4.3.0"
+  gem "rails-assets-markdown-it",                         "4.4.0"
  gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
  gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
  gem "rails-assets-markdown-it-sanitizer",               "0.3.1"
  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
  gem "rails-assets-markdown-it-sub",                     "1.0.0"
  gem "rails-assets-markdown-it-sup",                     "1.0.0"
-  gem "rails-assets-highlightjs",                         "8.5.0"
+  gem "rails-assets-highlightjs",                         "8.6.0"

  # jQuery plugins

  gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
-  gem "rails-assets-jquery-idletimer",              "1.0.1"
-  gem "rails-assets-jquery-placeholder",            "2.1.1"
+  gem "rails-assets-jquery-placeholder",            "2.1.2"
  gem "rails-assets-jquery-textchange",             "0.2.3"
-  gem "rails-assets-perfect-scrollbar",             "0.6.2"
+  gem "rails-assets-perfect-scrollbar",             "0.6.3"
  gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
 end

@@ -286,7 +285,7 @@ group :development, :test do
  # Jasmine (client side application tests (JS))
  gem "jasmine",                   "2.2.0"
  gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
+  gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
  gem "sinon-rails",               "1.15.0"

  # silence assets

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -521,11 +521,11 @@ GEM
      rails-assets-jquery-fullscreen (~> 1.1.4)
      rails-assets-jquery-ui (~> 1.10.4)
      rails-assets-jquery.slimscroll (~> 1.3.3)
-    rails-assets-highlightjs (8.5.0)
+    rails-assets-highlightjs (8.6.0)
    rails-assets-jakobmattsson--jquery-elastic (1.6.11)
      rails-assets-jquery (>= 1.2.6)
    rails-assets-jasmine (2.3.4)
-    rails-assets-jasmine-ajax (3.1.1)
+    rails-assets-jasmine-ajax (3.2.0)
      rails-assets-jasmine (~> 2)
    rails-assets-jeresig--jquery.hotkeys (0.2.0)
      rails-assets-jquery (>= 1.4.2)
@@ -533,8 +533,7 @@ GEM
    rails-assets-jquery-colorbox (1.5.15)
      rails-assets-jquery (>= 1.3.2)
    rails-assets-jquery-fullscreen (1.1.4)
-    rails-assets-jquery-idletimer (1.0.1)
-    rails-assets-jquery-placeholder (2.1.1)
+    rails-assets-jquery-placeholder (2.1.2)
      rails-assets-jquery (>= 1.6)
    rails-assets-jquery-simulate (1.0.1)
    rails-assets-jquery-simulate-ext (1.3.0)
@@ -546,13 +545,13 @@ GEM
    rails-assets-jquery.slimscroll (1.3.6)
      rails-assets-jquery (>= 1.7)
    rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
-    rails-assets-markdown-it (4.3.0)
+    rails-assets-markdown-it (4.4.0)
    rails-assets-markdown-it-diaspora-mention (0.3.0)
    rails-assets-markdown-it-hashtag (0.3.1)
    rails-assets-markdown-it-sanitizer (0.3.1)
    rails-assets-markdown-it-sub (1.0.0)
    rails-assets-markdown-it-sup (1.0.0)
-    rails-assets-perfect-scrollbar (0.6.2)
+    rails-assets-perfect-scrollbar (0.6.3)
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
    rails-dom-testing (1.0.6)
@@ -819,24 +818,23 @@ DEPENDENCIES
  rails (= 4.2.3)
  rails-assets-autosize (= 3.0.6)!
  rails-assets-diaspora_jsxc (~> 0.1.1)!
-  rails-assets-highlightjs (= 8.5.0)!
+  rails-assets-highlightjs (= 8.6.0)!
  rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
-  rails-assets-jasmine-ajax (= 3.1.1)!
+  rails-assets-jasmine-ajax (= 3.2.0)!
  rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
  rails-assets-jquery (= 1.11.2)!
-  rails-assets-jquery-idletimer (= 1.0.1)!
-  rails-assets-jquery-placeholder (= 2.1.1)!
+  rails-assets-jquery-placeholder (= 2.1.2)!
  rails-assets-jquery-simulate (= 1.0.1)!
  rails-assets-jquery-simulate-ext (= 1.3.0)!
  rails-assets-jquery-textchange (= 0.2.3)!
-  rails-assets-markdown-it (= 4.3.0)!
+  rails-assets-markdown-it (= 4.4.0)!
  rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
  rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
  rails-assets-markdown-it-hashtag (= 0.3.1)!
  rails-assets-markdown-it-sanitizer (= 0.3.1)!
  rails-assets-markdown-it-sub (= 1.0.0)!
  rails-assets-markdown-it-sup (= 1.0.0)!
-  rails-assets-perfect-scrollbar (= 0.6.2)!
+  rails-assets-perfect-scrollbar (= 0.6.3)!
  rails-i18n (= 4.0.4)
  rails-timeago (= 2.11.0)
  rails_admin (= 0.6.8)

--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -17,7 +17,6 @@
 //= require jquery.events.input
 //= require jakobmattsson-jquery-elastic
 //= require jquery.mentionsInput
-//= require jquery-idletimer/dist/idle-timer
 //= require jquery.infinitescroll-custom
 //= require jquery.autocomplete-custom
 //= require jquery-ui/core