Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/diaspora/diaspora
Browse files Browse the repository at this point in the history
  • Loading branch information
@prellele
prellele committed Mar 8, 2016
2 parents 1f33a02 + 56ebcc7 commit 4a4a106
Show file tree
Hide file tree
Showing 45 changed files with 466 additions and 399 deletions.
5 changes: 4 additions & 1 deletion .rubocop.yml
View file
@@ -1,7 +1,8 @@
AllCops:
RunRailsCops: true
Exclude:
- 'db/schema.rb'
- "bin/**/*"
- "db/schema.rb"

# Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength:
Expand All @@ -15,6 +16,8 @@ Metrics/MethodLength:
# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
Metrics/ClassLength:
Max: 1500
Metrics/ModuleLength:
Max: 1500

# Raise AbcSize from 15 to 20
Metrics/AbcSize:
Expand Down
20 changes: 20 additions & 0 deletions Changelog.md
View file
@@ -1,3 +1,23 @@
# 0.5.7.0

## Refactor
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
* Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658)
* Remove unlicensed images [#6673](https://github.com/diaspora/diaspora/pull/6673)
* Removed unused contacts\_title [#6687](https://github.com/diaspora/diaspora/pull/6687)

## Bug fixes
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
* Fix `suppress_annoying_errors` eating too much errors [#6653](https://github.com/diaspora/diaspora/pull/6653)
* Ensure the rubyzip gem is properly loaded [#6659](https://github.com/diaspora/diaspora/pull/6659)
* Fix mobile registration layout after failed registration [#6677](https://github.com/diaspora/diaspora/pull/6677)
* Fix mirrored names when using a RTL language [#6680](https://github.com/diaspora/diaspora/pull/6680)
* Disable submitting a post multiple times in the mobile UI [#6682](https://github.com/diaspora/diaspora/pull/6682)

## Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
* Add the podmin email address to 500 errors [#6652](https://github.com/diaspora/diaspora/pull/6652)

# 0.5.6.3

Fix evil regression caused by Active Model no longer exposing
Expand Down
64 changes: 32 additions & 32 deletions Gemfile
View file
Expand Up @@ -12,28 +12,28 @@ gem "unicorn", "5.0.1", require: false

# Federation

gem "diaspora_federation-rails", "0.0.11"
gem "diaspora_federation-rails", "0.0.12"

# API and JSON

gem "acts_as_api", "0.4.2"
gem "json", "1.8.3"
gem "json-schema", "2.5.2"
gem "json-schema", "2.6.0"

# Authentication

gem "devise", "3.5.4"
gem "devise", "3.5.6"
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", "3.4.2"
gem "sinatra", "1.4.6"
gem "sinatra", "1.4.7"

# Scheduled processing

Expand All @@ -56,22 +56,22 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "2.3.2.2"
gem "compass-rails", "2.0.5"
gem "sass-rails", "5.0.4"
gem "autoprefixer-rails", "6.2.2"
gem "autoprefixer-rails", "6.3.1"

# Database

ENV["DB"] ||= "mysql"

gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"

gem "activerecord-import", "0.10.0"
gem "activerecord-import", "0.11.0"

# File uploading

gem "carrierwave", "0.10.0"
gem "fog", "1.37.0"
gem "mini_magick", "4.3.6"
gem "mini_magick", "4.4.0"
gem "remotipart", "1.2.1"

# GUID generation
Expand All @@ -84,30 +84,30 @@ gem "entypo-rails", "2.2.3"
# 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.0.2"
gem "rails-assets-markdown-it", "6.0.0"
gem "rails-assets-markdown-it-hashtag", "0.4.0"
gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
gem "rails-assets-markdown-it-sanitizer", "0.4.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", "9.0.0"
gem "rails-assets-highlightjs", "9.1.0"

# jQuery plugins

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"
end

Expand All @@ -128,7 +128,7 @@ gem "messagebus_ruby_api", "1.0.3"

gem "nokogiri", "1.6.7.2"
gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.0"
gem "twitter-text", "1.13.3"
gem "roxml", "3.1.6"
gem "ruby-oembed", "0.9.0"
gem "open_graph_reader", "0.6.1"
Expand All @@ -139,12 +139,12 @@ gem "omniauth", "1.3.1"
gem "omniauth-facebook", "3.0.0"
gem "omniauth-tumblr", "1.2"
gem "omniauth-twitter", "1.2.1"
gem "twitter", "5.15.0"
gem "twitter", "5.16.0"
gem "omniauth-wordpress", "0.2.2"

# Serializers

gem "active_model_serializers", "0.9.3"
gem "active_model_serializers", "0.9.4"

# XMPP chat dependencies
gem "diaspora-vines", "~> 0.2.0.develop"
Expand All @@ -167,7 +167,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
Expand All @@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"

# Reading and writing zip files

gem "rubyzip", "1.1.7"
gem "rubyzip", "1.1.7", require: "zip"

# Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs:
Expand Down Expand Up @@ -227,16 +227,16 @@ group :development do
gem "guard-rspec", "4.6.4"
gem "guard-rubocop", "1.2.0"
gem "guard", "2.13.0", require: false
gem "rb-fsevent", "0.9.6", require: false
gem "rb-inotify", "0.9.5", require: false
gem "rb-fsevent", "0.9.7", require: false
gem "rb-inotify", "0.9.7", require: false

# Linters
gem "jshintrb", "0.3.0"
gem "rubocop", "0.35.1"

# Preloading environment

gem "spring", "1.6.1"
gem "spring", "1.6.3"
gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1"

Expand All @@ -246,7 +246,7 @@ group :development do
gem "pry-byebug"

# test coverage
gem "simplecov", "0.11.1", require: false
gem "simplecov", "0.11.2", require: false
end

group :test do
Expand All @@ -259,26 +259,26 @@ group :test do

# Cucumber (integration tests)

gem "capybara", "2.5.0"
gem "capybara", "2.6.2"
gem "database_cleaner" , "1.5.1"
gem "selenium-webdriver", "2.47.1"

# General helpers

gem "factory_girl_rails", "4.5.0"
gem "factory_girl_rails", "4.6.0"
gem "timecop", "0.8.0"
gem "webmock", "1.22.3", require: false
gem "shoulda-matchers", "3.0.1"
gem "webmock", "1.22.6", require: false
gem "shoulda-matchers", "3.1.1"

gem "diaspora_federation-test", "0.0.11"
gem "diaspora_federation-test", "0.0.12"
end

group :development, :test do
# RSpec (unit tests, some integration tests)
gem "rspec-rails", "3.3.3"
gem "rspec-rails", "3.4.2"

# Cucumber (integration tests)
gem "cucumber-rails", "1.4.2", require: false
gem "cucumber-rails", "1.4.3", require: false

# Jasmine (client side application tests (JS))
gem "jasmine", "2.4.0"
Expand Down

0 comments on commit 4a4a106

Please sign in to comment.