Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master

Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb

1 files changed, 32 insertions, 0 deletions

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
new file mode 100644
index 00000000000..6b334b87335
--- /dev/null
+++ b/app/views/devise/sessions/new.html.erb
@@ -0,0 +1,32 @@
+<% unless ldap_enable? -%>
+
+  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
+    <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
+
+    <%= f.text_field :email, :class => "text top", :placeholder => "Email" %>
+    <%= f.password_field :password, :class => "text bottom", :placeholder => "Password"  %>
+
+    <% if devise_mapping.rememberable? -%>
+      <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div>
+    <% end -%>
+    <br/>
+    <%= f.submit "Sign in", :class => "primary btn" %>
+    <div class="right"> <%= render :partial => "devise/shared/links" %></div>
+
+    <%- if devise_mapping.omniauthable? %>
+      <hr/>
+      <div class="auth_methods">
+        <ul>
+          <%- resource_class.omniauth_providers.each do |provider| %>
+          <li><%= link_to authbutton(provider),
+                   omniauth_authorize_path(resource_name, provider) %></li>
+          <% end -%>
+        </ul>
+      </div>
+    <% end -%>
+
+  <% end %>
+
+<% else %>
+  <%= render :partial => 'devise/sessions/new_ldap' %>
+<% end %>