[DRE-commits] [ruby-omniauth] 01/04: Merge tag 'upstream/1.2.2'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-omniauth.

commit 3a92d58651addd17de1b8872cd0f2a5d44fb2d1a
Merge: 33dbf56 9ba45cb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Nov 20 11:16:06 2014 +0530

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2
    
    # gpg: Signature made Thursday 20 November 2014 11:16:02 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"

 .rubocop.yml                               |  25 ++++++++++----------
 .travis.yml                                |   7 +-----
 Gemfile                                    |  16 +++++--------
 Gemfile.rack-1.3.x                         |   3 ++-
 README.md                                  |  11 ++++-----
 Rakefile                                   |   4 ++--
 certs/sferik.pem                           |  20 ----------------
 checksums.yaml.gz                          | Bin 270 -> 0 bytes
 checksums.yaml.gz.sig                      | Bin 256 -> 0 bytes
 data.tar.gz.sig                            | Bin 256 -> 0 bytes
 lib/omniauth.rb                            |   6 +++--
 lib/omniauth/auth_hash.rb                  |   2 +-
 lib/omniauth/builder.rb                    |   2 +-
 lib/omniauth/strategy.rb                   |  10 ++++----
 lib/omniauth/test/phony_session.rb         |  20 +++++++++-------
 lib/omniauth/version.rb                    |   2 +-
 metadata.gz.sig                            |   2 --
 metadata.yml                               |  36 +++++++----------------------
 omniauth.gemspec                           |  18 +++++++--------
 spec/helper.rb                             |   2 +-
 spec/omniauth/auth_hash_spec.rb            |   2 +-
 spec/omniauth/builder_spec.rb              |   2 +-
 spec/omniauth/strategies/developer_spec.rb |   4 ++--
 spec/omniauth/strategy_spec.rb             |  12 +++++-----
 24 files changed, 79 insertions(+), 127 deletions(-)

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