[DRE-commits] [ruby-saml] 03/07: fix merge issues

[Praveen Arimbrathodiyil]

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

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

commit b8ccca8c87adf085449cc590c76d7c099f7cf8bf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jul 10 12:51:54 2016 +0530

    fix merge issues
---
 README.md                                                | 6 ------
 changelog.md                                             | 1 -
 debian/patches/series                                    | 1 -
 lib/onelogin/ruby-saml/response.rb                       | 1 -
 test/responses/response_without_reference_uri.xml.base64 | 2 +-
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 8579ada..04b2b50 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,6 @@ For more details, please review [the changelog](changelog.md).
 
 Version `1.1` adds some improvements on signature validation and solves some namespace conflicts.
 
-## Updating from 1.0.x to 1.1.X
-
-Version `1.1` adds some improvements on signature validation and solves some namespace conflicts.
-
-For more details, please review [the changelog](changelog.md).
-
 ## Updating from 0.9.x to 1.0.X
 
 Version `1.0` is a recommended update for all Ruby SAML users as it includes security fixes.
diff --git a/changelog.md b/changelog.md
index 07f14f7..5b2e8b4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -20,7 +20,6 @@
 * [#306](https://github.com/onelogin/ruby-saml/pull/306) Support WantAssertionsSigned
 
 ### 1.1.2 (February 15, 2016)
->>>>>>> upstream/1.3.0
 * Improve signature validation. Add tests.
  [#302](https://github.com/onelogin/ruby-saml/pull/302) Add Destination validation.
 * [#292](https://github.com/onelogin/ruby-saml/pull/292) Improve the error message when validating the audience.
diff --git a/debian/patches/series b/debian/patches/series
index 553b098..2c2f2bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-remove-git-from-gemspec.diff
 remove-simplecov.patch
 remove-bundler.patch
 use-unshift-in-gemspec.patch
diff --git a/lib/onelogin/ruby-saml/response.rb b/lib/onelogin/ruby-saml/response.rb
index 39a7ab4..4dc4507 100644
--- a/lib/onelogin/ruby-saml/response.rb
+++ b/lib/onelogin/ruby-saml/response.rb
@@ -290,7 +290,6 @@ module OneLogin
       #
       def validate(collect_errors = false)
         reset_errors!
-
         return false unless validate_response_state
 
         validations = [
diff --git a/test/responses/response_without_reference_uri.xml.base64 b/test/responses/response_without_reference_uri.xml.base64
index c0fc3ed..603fceb 100644
--- a/test/responses/response_without_reference_uri.xml.base64
+++ b/test/responses/response_without_reference_uri.xml.base64
@@ -1 +1 @@
-PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8c2FtbHA6UmVzcG9uc2UgeG1sbnM6c2FtbHA9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpwcm90b2NvbCIgSUQ9InBmeGQ1OTQzNDdkLTQ5NWYtYjhkMS0wZWUyLTQxY2ZkYTE0ZGQzNSIgVmVyc2lvbj0iMi4wIiBJc3N1ZUluc3RhbnQ9IjIwMTUtMDEtMDJUMjI6NDg6NDhaIiBEZXN0aW5hdGlvbj0iaHR0cDovL2xvY2FsaG9zdDo5MDAxL3YxL3VzZXJzL2F1dGhvcml6ZS9zYW1sIiBDb25zZW50PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6Y29uc2VudDp1bnNwZWNpZmllZCIgSW5SZXNwb25zZVRvPSJfZWQ5MTVhNDAtNzRmYi0wMTMyLTViMTYtNDhlMGViMTRhMWM3Ij4NCiAgPElzc3VlciB4 [...]
+PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8c2FtbHA6UmVzcG9uc2UgeG1sbnM6c2FtbHA9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpwcm90b2NvbCIgSUQ9InBmeGQ1OTQzNDdkLTQ5NWYtYjhkMS0wZWUyLTQxY2ZkYTE0ZGQzNSIgVmVyc2lvbj0iMi4wIiBJc3N1ZUluc3RhbnQ9IjIwMTUtMDEtMDJUMjI6NDg6NDhaIiBEZXN0aW5hdGlvbj0iaHR0cDovL2xvY2FsaG9zdDo5MDAxL3YxL3VzZXJzL2F1dGhvcml6ZS9zYW1sIiBDb25zZW50PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6Y29uc2VudDp1bnNwZWNpZmllZCIgSW5SZXNwb25zZVRvPSJfZWQ5MTVhNDAtNzRmYi0wMTMyLTViMTYtNDhlMGViMTRhMWM3Ij4NCiAgPElzc3VlciB4 [...]
\ No newline at end of file

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