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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-02-01 00:06:06 +01:00
commit 3a1ead1b21
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Gemfile
View file

@ -22,18 +22,18 @@ gem "json-schema", "2.5.2"
# Authentication
gem "devise", "3.5.4"
gem "devise", "3.5.5"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0"
# Captcha
gem "simple_captcha2", "0.3.4", require: "simple_captcha"
gem "simple_captcha2", "0.4.0", require: "simple_captcha"
# Background processing
gem "sidekiq", "4.0.1"
gem "sinatra", "1.4.6"
gem "sinatra", "1.4.7"
# Scheduled processing
@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "3.3.6"
gem "compass-rails", "2.0.5"
gem "sass-rails", "5.0.4"
gem "autoprefixer-rails", "6.2.2"
gem "autoprefixer-rails", "6.3.1"
gem "bootstrap-switch-rails", "3.3.3"
# Database
@ -87,14 +87,14 @@ gem "entypo-rails", "3.0.0.pre.rc2"
# JavaScript
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.22.0"
gem "jquery-rails", "4.0.5"
gem "handlebars_assets", "0.23.0"
gem "jquery-rails", "4.1.0"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
gem "js-routes", "1.2.0"
gem "js-routes", "1.2.3"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "5.1.0"
gem "rails-assets-markdown-it-hashtag", "0.4.0"
@ -103,7 +103,7 @@ source "https://rails-assets.org" do
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", "9.0.0"
gem "rails-assets-highlightjs", "9.1.0"
gem "rails-assets-typeahead.js", "0.11.1"
# jQuery plugins
@ -111,7 +111,7 @@ source "https://rails-assets.org" do
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.8"
gem "rails-assets-perfect-scrollbar", "0.6.10"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
gem "rails-assets-autosize", "3.0.14"
gem "rails-assets-blueimp-gallery", "2.16.0"
@ -177,7 +177,7 @@ gem "typhoeus", "0.8.0"
gem "gon", "6.0.1"
gem "haml", "4.0.7"
gem "mobile-fu", "1.3.1"
gem "will_paginate", "3.0.7"
gem "will_paginate", "3.1.0"
gem "rails-timeago", "2.11.0"
# Logging

52
Gemfile.lock
View file

@ -58,7 +58,7 @@ GEM
astrolabe (1.3.1)
parser (~> 2.2)
attr_required (1.0.0)
autoprefixer-rails (6.2.2)
autoprefixer-rails (6.3.1)
execjs
json
backbone-on-rails (1.2.0.0)
@ -140,7 +140,7 @@ GEM
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_cleaner (1.5.1)
devise (3.5.4)
devise (3.5.5)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
@ -374,11 +374,11 @@ GEM
haml (~> 4.0)
rubocop (>= 0.25.0)
sysexits (~> 1.1)
handlebars_assets (0.22.0)
handlebars_assets (0.23.0)
execjs (~> 2.0)
multi_json (~> 1.0)
sprockets (>= 2.0.0, < 4.0)
tilt (~> 1.2)
sprockets (>= 2.0.0)
tilt (>= 1.2)
hashdiff (0.2.3)
hashie (3.4.3)
hike (1.2.3)
@ -414,13 +414,13 @@ GEM
rake
jasmine-core (2.4.1)
jasmine-jquery-rails (2.0.3)
jquery-rails (4.0.5)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
js-routes (1.2.0)
js-routes (1.2.3)
railties (>= 3.2)
sprockets-rails
js_image_paths (0.0.2)
@ -612,7 +612,7 @@ GEM
rails-assets-jquery.slimscroll (~> 1.3.6)
rails-assets-jquery.ui (~> 1.11.4)
rails-assets-favico.js (0.3.10)
rails-assets-highlightjs (9.0.0)
rails-assets-highlightjs (9.1.0)
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
rails-assets-jquery (>= 1.2.6)
rails-assets-jasmine (2.4.1)
@ -620,7 +620,7 @@ GEM
rails-assets-jasmine (~> 2)
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
rails-assets-jquery (1.11.2)
rails-assets-jquery (1.12.0)
rails-assets-jquery-colorbox (1.6.3)
rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0)
@ -638,7 +638,7 @@ GEM
rails-assets-markdown-it-sanitizer (0.4.1)
rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0)
rails-assets-perfect-scrollbar (0.6.8)
rails-assets-perfect-scrollbar (0.6.10)
rails-assets-typeahead.js (0.11.1)
rails-assets-jquery (>= 1.7)
rails-deprecated_sanitizer (1.0.3)
@ -763,7 +763,7 @@ GEM
rufus-scheduler (>= 2.0.24)
sidekiq (>= 4.0.0)
sigar (0.7.3)
simple_captcha2 (0.3.4)
simple_captcha2 (0.4.0)
rails (>= 4.1)
simple_oauth (0.3.1)
simplecov (0.11.1)
@ -771,8 +771,8 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.4.6)
rack (~> 1.4)
sinatra (1.4.7)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinon-rails (1.15.0)
@ -853,7 +853,7 @@ GEM
activesupport (>= 3)
railties (>= 3)
yard (~> 0.7)
warden (1.2.4)
warden (1.2.6)
rack (>= 1.0)
webfinger (1.0.1)
activesupport
@ -864,7 +864,7 @@ GEM
crack (>= 0.3.2)
hashdiff
websocket (1.2.2)
will_paginate (3.0.7)
will_paginate (3.1.0)
xml-simple (1.1.5)
xpath (2.0.0)
nokogiri (~> 1.3)
@ -880,7 +880,7 @@ DEPENDENCIES
acts_as_api (= 0.4.2)
addressable (= 2.3.8)
asset_sync (= 1.1.0)
autoprefixer-rails (= 6.2.2)
autoprefixer-rails (= 6.3.1)
backbone-on-rails (= 1.2.0.0)
bootstrap-sass (= 3.3.6)
bootstrap-switch-rails (= 3.3.3)
@ -891,7 +891,7 @@ DEPENDENCIES
cucumber-api-steps (= 0.13)
cucumber-rails (= 1.4.2)
database_cleaner (= 1.5.1)
devise (= 3.5.4)
devise (= 3.5.5)
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.2.0.develop)
@ -914,14 +914,14 @@ DEPENDENCIES
guard-rubocop (= 1.2.0)
haml (= 4.0.7)
haml_lint (= 0.15.2)
handlebars_assets (= 0.22.0)
handlebars_assets (= 0.23.0)
http_accept_language (= 2.0.5)
i18n-inflector-rails (= 1.0.7)
jasmine (= 2.4.0)
jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.0.5)
jquery-rails (= 4.1.0)
jquery-ui-rails (= 5.0.5)
js-routes (= 1.2.0)
js-routes (= 1.2.3)
js_image_paths (= 0.0.2)
jshintrb (= 0.3.0)
json (= 1.8.3)
@ -963,11 +963,11 @@ DEPENDENCIES
rails-assets-autosize (= 3.0.14)!
rails-assets-blueimp-gallery (= 2.16.0)!
rails-assets-diaspora_jsxc (~> 0.1.5.develop)!
rails-assets-highlightjs (= 9.0.0)!
rails-assets-highlightjs (= 9.1.0)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.2)!
rails-assets-jquery (= 1.12.0)!
rails-assets-jquery-placeholder (= 2.3.1)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 5.1.0)!
@ -977,7 +977,7 @@ DEPENDENCIES
rails-assets-markdown-it-sanitizer (= 0.4.1)!
rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.8)!
rails-assets-perfect-scrollbar (= 0.6.10)!
rails-assets-typeahead.js (= 0.11.1)!
rails-i18n (= 4.0.8)
rails-timeago (= 2.11.0)
@ -998,9 +998,9 @@ DEPENDENCIES
shoulda-matchers (= 3.0.1)
sidekiq (= 4.0.1)
sidekiq-cron (= 0.4.1)
simple_captcha2 (= 0.3.4)
simple_captcha2 (= 0.4.0)
simplecov (= 0.11.1)
sinatra (= 1.4.6)
sinatra (= 1.4.7)
sinon-rails (= 1.15.0)
spring (= 1.6.1)
spring-commands-cucumber (= 1.0.1)
@ -1015,7 +1015,7 @@ DEPENDENCIES
uuid (= 2.3.8)
versionist (= 1.4.1)
webmock (= 1.22.3)
will_paginate (= 3.0.7)
will_paginate (= 3.1.0)
BUNDLED WITH
1.11.2