Omniauth adjustments for Shibboleth integration.

Created by: TiagoTT

Following this discussion: https://groups.google.com/forum/#!topic/gitlabhq/t860p0HWXFU

These are the changes I present to unify Omniauth provider handling and to add support to Shibboleth authentication. The omniauth-shibboleth module has been changed to improve configuration and is pending upstream approval, so I have included my own version from the Gemfile.

app/assets/javascripts/merge_requests.js.coffee

@@ -51,6 +51,10 @@ class MergeRequest
     this.$('.nav-tabs').on 'click', 'li', (event) =>
       this.activateTab($(event.currentTarget).data('action'))
+    this.$('.accept_merge_request').on 'click', ->
+      $('.automerge_widget.can_be_merged').hide()
+      $('.merge-in-progress').show()
+
   activateTab: (action) ->
     this.$('.nav-tabs li').removeClass 'active'
     this.$('.tab-content').hide()