Alloww Shibboleth OmniAuth users to login, just like LDAP users.
Shibboleth authentication configuration.
Gemfile and Gemfile.lock update. Adding a patched version of omniauth-shibboleth gem.
Unifying Omniauth configuration.

Merging LDAP and Shibboleth Omniauth configurations and code into the common Omniauth configuration and code.
Merge branch 'master' of http://github.com/TiagoTT/gitlabhq
Updating omniauth-shibboleth module version.
Removing the tests for the functions removed before.

Please review this carefuly. I am not sure this is good.
Changes to omniauth-shibboleth gem were accepted by upstream.

Changed Gemfile and updated configuration example.
Updated Gemfile.lock after bundle install.
Adding Shibboleth logo in sizes 32x32 and 64x64 pixels in PNG format.

The logo consists of an orange dragon and was croped from the banner found at:
http://shibboleth.net/
http://shibboleth.net/images/shibboleth_logo.png

The created files have the following specifications:
shibboleth_32.png: PNG image data, 32 x 32, 8-bit/color RGBA, non-interlaced
shibboleth_64.png: PNG image data, 64 x 64, 8-bit/color RGBA, non-interlaced
It turns out that the Shibboleth logo is not appropriate for this.

The authentication method is SAML and Shibboleth is an implementation that uses SAML.
Adding automatic Shibboleth login if Shibboleth is enabled.
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of github.com:gitlabhq/gitlabhq

Conflicts:
	lib/gitlab/auth.rb
Merge tag 'v3.0.3' of github.com:gitlabhq/gitlabhq

version 3.0.3

Conflicts:
	app/models/user.rb
	lib/gitlab/auth.rb
Hiding Omniauth and Password sections in Profile/Account settings when omniauth.allow_single_sign_on is enabled.

If single sign on is enabled, the user has no need for password setting in GitLab.
In that same case, an Omniauth provider has already been chosen by the site administrators and must be used, thus there is no need for selecting alternative authentication providers.
Hiding GIT HTTP URL on project homepage if Shibboleth and Single Sign On are in use.

Access to Shibboleth protected resources only make sence if you can be redirected to the login server for authentication and then redirected back to the application.
When using a GIT client to interact with a remote GIT repository, I can't think of any way to authenticate with Shibboleth.
Merge tag 'v4.1.0' of github.com:gitlabhq/gitlabhq

version 4.1.0

Conflicts:
	Gemfile.lock
	app/controllers/omniauth_callbacks_controller.rb
	app/views/profiles/account.html.haml
	app/views/projects/_clone_panel.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/devise.rb
	lib/gitlab/auth.rb
Username from authentication provider is preferred over first part of the email.
Fetching the username from a given Shibboleth variable.