nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7931 from SuperTux88/update-gems

Browse source 
Update gems
This commit is contained in:
Benjamin Neff 2018-11-17 23:40:09 +01:00
commit 24fbd59d21
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile
View file

@ -112,9 +112,9 @@ source "https://rails-assets.org" do
gem "rails-assets-backbone", "1.3.3" gem "rails-assets-backbone", "1.3.3"
gem "rails-assets-bootstrap-markdown", "2.10.0" gem "rails-assets-bootstrap-markdown", "2.10.0"
gem "rails-assets-corejs-typeahead", "1.2.1" gem "rails-assets-corejs-typeahead", "1.2.1"
gem "rails-assets-cropperjs", "1.3.4" gem "rails-assets-cropperjs", "1.4.3"
gem "rails-assets-fine-uploader", "5.13.0" gem "rails-assets-fine-uploader", "5.13.0"
gem "rails-assets-pica", "4.0.1" gem "rails-assets-pica", "5.0.0"
# jQuery plugins # jQuery plugins
@ -147,7 +147,7 @@ gem "nokogiri", "1.8.5"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0" gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.12.0" gem "ruby-oembed", "0.12.0"
gem "twitter-text", "2.1.0" gem "twitter-text", "3.0.0"
# RTL support # RTL support

12
Gemfile.lock
View file

@ -526,7 +526,7 @@ GEM
rails-assets-bootstrap (~> 3) rails-assets-bootstrap (~> 3)
rails-assets-corejs-typeahead (1.2.1) rails-assets-corejs-typeahead (1.2.1)
rails-assets-jquery (>= 1.11) rails-assets-jquery (>= 1.11)
rails-assets-cropperjs (1.3.4) rails-assets-cropperjs (1.4.3)
rails-assets-diaspora_jsxc (0.1.5.develop.7) rails-assets-diaspora_jsxc (0.1.5.develop.7)
rails-assets-emojione (~> 2.0.1) rails-assets-emojione (~> 2.0.1)
rails-assets-favico.js (>= 0.3.10, < 0.4) rails-assets-favico.js (>= 0.3.10, < 0.4)
@ -561,7 +561,7 @@ GEM
rails-assets-markdown-it-sanitizer (0.4.3) rails-assets-markdown-it-sanitizer (0.4.3)
rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0) rails-assets-markdown-it-sup (1.0.0)
rails-assets-pica (4.0.1) rails-assets-pica (5.0.0)
rails-assets-underscore (1.9.1) rails-assets-underscore (1.9.1)
rails-assets-utatti-perfect-scrollbar (1.4.0) rails-assets-utatti-perfect-scrollbar (1.4.0)
rails-controller-testing (1.0.2) rails-controller-testing (1.0.2)
@ -718,7 +718,7 @@ GEM
multipart-post (~> 2.0) multipart-post (~> 2.0)
naught (~> 1.0) naught (~> 1.0)
simple_oauth (~> 0.3.0) simple_oauth (~> 0.3.0)
twitter-text (2.1.0) twitter-text (3.0.0)
idn-ruby idn-ruby
unf (~> 0.1.0) unf (~> 0.1.0)
typhoeus (1.3.1) typhoeus (1.3.1)
@ -856,7 +856,7 @@ DEPENDENCIES
rails-assets-blueimp-gallery (= 2.33.0)! rails-assets-blueimp-gallery (= 2.33.0)!
rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-bootstrap-markdown (= 2.10.0)!
rails-assets-corejs-typeahead (= 1.2.1)! rails-assets-corejs-typeahead (= 1.2.1)!
rails-assets-cropperjs (= 1.3.4)! rails-assets-cropperjs (= 1.4.3)!
rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
rails-assets-fine-uploader (= 5.13.0)! rails-assets-fine-uploader (= 5.13.0)!
rails-assets-highlightjs (= 9.12.0)! rails-assets-highlightjs (= 9.12.0)!
@ -873,7 +873,7 @@ DEPENDENCIES
rails-assets-markdown-it-sanitizer (= 0.4.3)! rails-assets-markdown-it-sanitizer (= 0.4.3)!
rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-pica (= 4.0.1)! rails-assets-pica (= 5.0.0)!
rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
rails-controller-testing (= 1.0.2) rails-controller-testing (= 1.0.2)
rails-i18n (= 5.1.2) rails-i18n (= 5.1.2)
@ -905,7 +905,7 @@ DEPENDENCIES
timecop (= 0.9.1) timecop (= 0.9.1)
turbo_dev_assets (= 0.0.2) turbo_dev_assets (= 0.0.2)
twitter (= 6.2.0) twitter (= 6.2.0)
twitter-text (= 2.1.0) twitter-text (= 3.0.0)
typhoeus (= 1.3.1) typhoeus (= 1.3.1)
uglifier (= 4.1.19) uglifier (= 4.1.19)
unicorn (= 5.4.1) unicorn (= 5.4.1)