Merge branch 'master' into api_create_project_fixes

app/decorators/commit_decorator.rb

@@ -16,6 +16,8 @@ class CommitDecorator < ApplicationDecorator
   # In case this first line is longer than 80 characters, it is cut off
   # after 70 characters and ellipses (`&hellp;`) are appended.
   def title
+    return no_commit_message unless safe_message
+
     title_end = safe_message.index(/\n/)
     if (!title_end && safe_message.length > 80) || (title_end && title_end > 80)
       safe_message[0..69] << "&hellip;".html_safe
@@ -35,4 +37,10 @@ class CommitDecorator < ApplicationDecorator
       safe_message.split(/\n/, 2)[1].try(:chomp)
     end
   end
+
+  protected
+
+  def no_commit_message
+    "--no commit message"
+  end
 end

app/views/devise/sessions/_new_ldap.html.erb

-<%= form_tag(user_omniauth_callback_path(:ldap), :class => "login-box", :id => 'new_ldap_user' ) do %>
-  <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
-
-  <%= text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"} %>
-  <%= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} %>
-
-  <br/>
-  <%= submit_tag "LDAP Sign in", :class => "primary btn" %>
-
-  <%- if devise_mapping.omniauthable? %>
-    <%- (resource_class.omniauth_providers - [:ldap]).each do |provider| %>
-      <hr/>
-      <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br />
-    <% end -%>
-  <% end -%>
-
-  <hr/>
-  <a href="#" id="other_form_toggle" onclick="javascript:$('#new_user').toggle();">Other Sign in</a>
-  <!-- inline for right now just to illustrate -->
-  <script type="text/javascript">
-    $(function() {
-      $('#new_user').toggle();
-    });
-  </script>
-<% end %>
-
-
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
-  <%= 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>
-
-<% end %>

app/views/devise/sessions/_new_ldap.html.haml

+= form_tag(user_omniauth_callback_path(:ldap), :class => "login-box", :id => 'new_ldap_user' ) do
+  = image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo"
+  = text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"}
+  = password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"}
+  %br/
+  = submit_tag "LDAP Sign in", :class => "primary btn"
+  - if devise_mapping.omniauthable?
+    - (resource_class.omniauth_providers - [:ldap]).each do |provider|
+      %hr/
+      = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary"
+      %br/
+  %hr/
+  %a#other_form_toggle{:href => "#", :onclick => "javascript:$('#new_user').toggle();"} Other Sign in
+  :javascript
+    $(function() {
+      $('#new_user').toggle();
+    });
+  = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f|
+  = f.text_field :email, :class => "text top", :placeholder => "Email"
+  = f.password_field :password, :class => "text bottom", :placeholder => "Password"
+  - if devise_mapping.rememberable?
+    .clearfix.inputs-list
+      %label.checkbox.remember_me{:for => "user_remember_me"}
+        = f.check_box :remember_me
+        %span Remember me
+  %br/
+  = f.submit "Sign in", :class => "primary btn"
+  .right
+    = render :partial => "devise/shared/links"

app/views/devise/sessions/new.html.erb

-<% 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? %>
-      <%- resource_class.omniauth_providers.each do |provider| %>
-        <hr/>
-        <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br />
-      <% end -%>
-    <% end -%>
-
-  <% end %>
-
-<% else %>
-  <%= render :partial => 'devise/sessions/new_ldap' %>
-<% end %>

app/views/devise/sessions/new.html.haml

+- if ldap_enable?
+  = render :partial => 'devise/sessions/new_ldap'
+- else
+  = 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?
+      .clearfix.inputs-list
+        %label.checkbox.remember_me{:for => "user_remember_me"}
+          = f.check_box :remember_me
+          %span Remember me
+    %br/
+    = f.submit "Sign in", :class => "primary btn wide"
+    .right
+      = render :partial => "devise/shared/links"
+    - if devise_mapping.omniauthable?
+      - resource_class.omniauth_providers.each do |provider|
+        %hr/
+        = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary"
+        %br/