[DRE-commits] [ruby-fast-gettext] 01/04: Merge tag 'upstream/1.2.0'

[Michael Moll]

This is an automated email from the git hooks/post-receive script.

mmoll-guest pushed a commit to branch master
in repository ruby-fast-gettext.

commit 93befcfe5f53c1f4f23703c6b3bbaeb2480d3859
Merge: d1e6d04 723b318
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Tue Sep 6 00:14:55 2016 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .travis.yml                                        |  28 ++--
 CHANGELOG                                          |   1 +
 Gemfile.lock                                       |  68 +++++-----
 Readme.md                                          |  48 ++++---
 examples/db/migration.rb                           |   4 +-
 fast_gettext.gemspec                               |   6 +-
 gemfiles/rails23.gemfile                           |   6 -
 gemfiles/rails23.gemfile.lock                      |  58 ---------
 gemfiles/rails32.gemfile                           |   5 -
 gemfiles/rails32.gemfile.lock                      | 114 ----------------
 gemfiles/rails40.gemfile.lock                      | 110 ----------------
 gemfiles/rails41.gemfile                           |   6 -
 gemfiles/rails41.gemfile.lock                      | 116 -----------------
 gemfiles/{rails40.gemfile => rails42.gemfile}      |   4 +-
 gemfiles/rails42.gemfile.lock                      | 140 ++++++++++++++++++++
 gemfiles/rails50.gemfile                           |   5 +
 gemfiles/rails50.gemfile.lock                      | 142 ++++++++++++++++++++
 lib/fast_gettext/mo_file.rb                        |  28 ++--
 lib/fast_gettext/po_file.rb                        |  24 +++-
 lib/fast_gettext/translation_repository.rb         |   7 +-
 lib/fast_gettext/translation_repository/merge.rb   |  73 +++++++++++
 lib/fast_gettext/translation_repository/mo.rb      |   7 +-
 lib/fast_gettext/translation_repository/po.rb      |   2 +-
 lib/fast_gettext/version.rb                        |   2 +-
 spec/fast_gettext/mo_file_spec.rb                  |  35 ++++-
 spec/fast_gettext/po_file_spec.rb                  |  33 ++++-
 .../fast_gettext/translation_repository/db_spec.rb |   4 +-
 .../translation_repository/merge_spec.rb           | 145 +++++++++++++++++++++
 .../fast_gettext/translation_repository/mo_spec.rb |   2 +-
 .../fast_gettext/translation_repository/po_spec.rb |   6 +-
 30 files changed, 713 insertions(+), 516 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-fast-gettext.git