Merge branch 'master' of dev.gitlabhq.com:gitlabhq

app/assets/javascripts/application.js

@@ -10,6 +10,8 @@
 //= require jquery.ui.selectmenu
 //= require jquery.tagify
 //= require jquery.cookie
+//= require modernizr
+//= require chosen
 //= require raphael
 //= require branch-graph
 //= require_tree .
@@ -22,9 +24,9 @@ $(function(){
   $('select#branch').selectmenu({style:'popup', width:200});
   $('select#tag').selectmenu({style:'popup', width:200});
 
-	$(".account-box").mouseenter(showMenu);
-	$(".account-box").mouseleave(resetMenu);
-	
+  $(".account-box").mouseenter(showMenu);
+  $(".account-box").mouseleave(resetMenu);
+
 });
 
 function updatePage(data){
@@ -32,9 +34,9 @@ function updatePage(data){
 }
 
 function showMenu() {
-	$(this).toggleClass('hover');
+  $(this).toggleClass('hover');
 }
 
 function resetMenu() {
-	$(this).removeClass("hover");
+  $(this).removeClass("hover");
 }

app/assets/javascripts/commits.js

@@ -8,25 +8,23 @@ $(document).ready(function(){
   });
 });
 
-
-
-var CommitsList = { 
+var CommitsList = {
 
 ref:null,
 limit:0,
 offset:0,
 
-init: 
-  function(ref, limit) { 
-    this.ref=ref; 
-    this.limit=limit; 
-    this.offset=limit; 
+init:
+  function(ref, limit) {
+    this.ref=ref;
+    this.limit=limit;
+    this.offset=limit;
     this.initLoadMore();
     $('.loading').show();
   },
 
 getOld:
-  function() { 
+  function() {
     $('.loading').show();
     $.ajax({
       type: "GET",
@@ -39,14 +37,14 @@ getOld:
 append:
   function(count, html) {
     $("#commits_list").append(html);
-    if(count > 0) { 
+    if(count > 0) {
       this.offset += count;
       this.initLoadMore();
-    }  
+    }
   },
 
 initLoadMore:
-  function() { 
+  function() {
     $(window).bind('scroll', function(){
       if($(window).scrollTop() == $(document).height() - $(window).height()){
         $(window).unbind('scroll');

app/assets/javascripts/note.js

-var NoteList = { 
+var NoteList = {
 
 first_id: 0,
 last_id: 0,
 resource_name: null,
 
-init: 
-  function(resource_name, first_id, last_id) { 
-    this.resource_name = resource_name; 
-    this.first_id = first_id; 
-    this.last_id = last_id; 
+init:
+  function(resource_name, first_id, last_id) {
+    this.resource_name = resource_name;
+    this.first_id = first_id;
+    this.last_id = last_id;
     this.initRefresh();
     this.initLoadMore();
   },
 
 getOld:
-  function() { 
+  function() {
     $('.loading').show();
     $.ajax({
       type: "GET",
@@ -31,7 +31,7 @@ append:
     this.initLoadMore();
   },
 
-replace: 
+replace:
   function(fid, lid, html) {
     this.first_id = fid;
     this.last_id = lid;
@@ -39,17 +39,16 @@ replace:
     this.initLoadMore();
   },
 
-
 prepend:
   function(id, html) {
-    if(id != this.last_id) { 
+    if(id != this.last_id) {
       this.last_id = id;
       $("#notes-list").prepend(html);
     }
   },
 
 getNew:
-  function() { 
+  function() {
     // refersh notes list
     $.ajax({
       type: "GET",
@@ -59,7 +58,7 @@ getNew:
   },
 
 refresh:
-  function() { 
+  function() {
     // refersh notes list
     $.ajax({
       type: "GET",
@@ -68,8 +67,6 @@ refresh:
       dataType: "script"});
   },
 
-
-
 initRefresh:
   function() {
     // init timer
@@ -78,7 +75,7 @@ initRefresh:
   },
 
 initLoadMore:
-  function() { 
+  function() {
     $(window).bind('scroll', function(){
       if($(window).scrollTop() == $(document).height() - $(window).height()){
         $(window).unbind('scroll');

app/assets/javascripts/projects.js

@@ -48,7 +48,6 @@ function taggifyForm(){
       source: '/tags.json'
   });
 
-
   $('form').submit( function() {
     var tag_field = $('#tag_field')
        tag_field.val( tag_field.tagify('serialize') );

app/assets/stylesheets/application.css

@@ -5,6 +5,7 @@
  *= require jquery-ui/jquery-ui
  *= require jquery-ui/jquery.ui.selectmenu
  *= require jquery-ui/jquery.tagify
+ *= require chosen
  *= require_self
  *= require_tree .
 */
@@ -15,10 +16,10 @@
 .cgreen { color:#44aa22; }
 
 /** COMMON STYLES **/
-.left { 
+.left {
   float:left;
 }
-.right { 
+.right {
   float:right;
 }
 .width-50p{
@@ -33,7 +34,7 @@
 .width-65p{
   width:65%;
 }
-.append-bottom-10 { 
+.append-bottom-10 {
   margin-bottom:10px;
 }
 .prepend-top-10 {

app/assets/stylesheets/issues.css.scss

@@ -12,7 +12,7 @@
 
 .issues_filter {
   margin-top:10px;
-  .left { 
+  .left {
     margin-right:15px;
   }
 }
@@ -38,11 +38,10 @@
 
 /** ISSUES LIST **/
 .issue .action-links {
-  display:none; 
-  a { 
+  display:none;
+  a {
     margin-left:10px;
   }
 }
 .issue:hover .action-links { display:block; }
 
-

app/assets/stylesheets/notes.css.scss

@@ -14,7 +14,6 @@
   }
 }
 
-
 /* Note textare */
 #note_note {
   height:100px;

app/assets/stylesheets/projects.css.scss

@@ -99,15 +99,15 @@ a {
   }
 }
 
-td.code { 
+td.code {
   width: 100%;
-  .highlight { 
+  .highlight {
     margin-left: 55px;
     overflow:auto;
     overflow-y:hidden;
   }
 }
-.highlight pre { 
+.highlight pre {
   white-space: pre;
   word-wrap:normal;
 }
@@ -115,12 +115,11 @@ td.code {
 .highlighttable tr:hover {
   background:white;
 }
-table.highlighttable pre{ 
+table.highlighttable pre{
   line-height:16px !important;
   font-size:12px !important;
 }
 
-
 table.highlighttable .linenodiv pre {
   text-align: right;
   padding-right: 4px;
@@ -235,7 +234,6 @@ input.ssh_project_url {
   }
 }
 
-
 #user_projects_limit{
   width: 60px;
 }
@@ -244,7 +242,7 @@ input.ssh_project_url {
   cursor: move;
 }
 
-.project-refs-form { 
+.project-refs-form {
   span {
     background: none !important;
     position:static !important;
@@ -258,18 +256,18 @@ input.ssh_project_url {
 }
 
 .filter .left { margin-right:15px; }
- 
-body.project-page table .commit { 
-  a.tree-commit-link { 
+
+body.project-page table .commit {
+  a.tree-commit-link {
     color:gray;
-    &:hover { 
+    &:hover {
       text-decoration:underline;
     }
   }
 }
 
 /** NEW PROJECT **/
-.new-project-hodler { 
+.new-project-hodler {
   .icon span { background-position: -31px -70px; }
   td { border-bottom: 1px solid #DEE2E3; }
 }
@@ -277,8 +275,8 @@ body.project-page table .commit {
 /** Feed entry **/
 .commit,
 .snippet,
-.message { 
-  .title { 
+.message {
+  .title {
     color:#666;
     a { color:#666 !important; }
     p { margin-top:0px; }
@@ -295,21 +293,21 @@ body.project-page table .commit {
   font-size:1.5em;
   height:auto;
   font-weight:bold;
-  .ui-selectmenu-status { 
+  .ui-selectmenu-status {
     padding:3px 10px;
   }
 }
- 
+
 /** Snippets **/
-.new_snippet textarea, 
-.edit_snippet textarea { 
+.new_snippet textarea,
+.edit_snippet textarea {
   height:300px;
   padding: 8px;
   width: 95%;
 }
 .snippet .action-links {
-  display:none; 
-  a { 
+  display:none;
+  a {
     margin-left:10px;
   }
 }
@@ -348,11 +346,11 @@ body.project-page table .commit {
     background: #2c5c66;
     color:white;
   }
-  &.issue { 
+  &.issue {
     background: #D12F19;
     color:white;
   }
-  &.commit { 
+  &.commit {
     background: #44aacc;
     color:white;
   }

app/assets/stylesheets/tags.css.css

 .tags-list {
-	padding : 0px 10px 10px 10px;
-	
+  padding : 0px 10px 10px 10px;
+  
 }
 
 .tags-list a {
@@ -15,7 +15,6 @@
     font-size: 14px;
 }
 
-
 .small-tags a{
   font-size: 9px;
 
@@ -26,10 +25,9 @@
   background-color: #72bbdf;
   color: #FFF;
   text-shadow: none;
-  font-weight: bold;  
+  font-weight: bold;
 }
 
-
 .medium-tags a{
   font-size: 12px;
 
@@ -40,5 +38,5 @@
   background-color: #72bbdf;
   color: #FFF;
   text-shadow: none;
-  font-weight: bold;  
-}
\ No newline at end of file
+  font-weight: bold;
+}

app/controllers/application_controller.rb

@@ -79,8 +79,8 @@ class ApplicationController < ActionController::Base
     elsif params[:last_id]
       @notes = @notes.where("id > ?", params[:last_id])
     elsif params[:first_id]
-      @notes = @notes.where("id < ?", params[:first_id]) 
-    else 
+      @notes = @notes.where("id < ?", params[:first_id])
+    else
       nil
     end
   end

app/controllers/commits_controller.rb

@@ -10,10 +10,9 @@ class CommitsController < ApplicationController
   before_filter :require_non_empty_project
   before_filter :load_refs, :only => :index # load @branch, @tag & @ref
 
-
   def index
     @repo = project.repo
-    limit, offset = (params[:limit] || 20), (params[:offset] || 0) 
+    limit, offset = (params[:limit] || 20), (params[:offset] || 0)
 
     @commits = if params[:path]
                  @repo.log(@ref, params[:path], :max_count => limit, :skip => offset)
@@ -24,6 +23,7 @@ class CommitsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.js
+      format.atom { render :layout => false }
     end
   end
 
@@ -32,7 +32,7 @@ class CommitsController < ApplicationController
     @notes = project.commit_notes(@commit).fresh.limit(20)
     @note = @project.build_commit_note(@commit)
 
-    respond_to do |format| 
+    respond_to do |format|
       format.html
       format.js { respond_with_notes }
     end

app/controllers/issues_controller.rb

@@ -24,6 +24,7 @@ class IssuesController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.js
+      format.atom { render :layout => false }
     end
   end
 
@@ -40,7 +41,7 @@ class IssuesController < ApplicationController
     @notes = @issue.notes.inc_author.order("created_at DESC").limit(20)
     @note = @project.notes.new(:noteable => @issue)
 
-    respond_to do |format| 
+    respond_to do |format|
       format.html
       format.js { respond_with_notes }
     end
@@ -97,7 +98,7 @@ class IssuesController < ApplicationController
                   else @project.issues.opened
                 end
 
-    @issues = @issues.where("title LIKE ? OR content LIKE ?", "%#{terms}%", "%#{terms}%") unless terms.blank?
+    @issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank?
 
     render :partial => 'issues'
   end

app/controllers/projects_controller.rb

@@ -79,7 +79,7 @@ class ProjectsController < ApplicationController
     @notes = @project.common_notes.order("created_at DESC")
     @notes = @notes.fresh.limit(20)
 
-    respond_to do |format| 
+    respond_to do |format|
       format.html
       format.js { respond_with_notes }
     end
@@ -168,7 +168,7 @@ class ProjectsController < ApplicationController
 
   def add_refs(commit, ref_cache)
     if ref_cache.empty?
-      @repo.refs.each do |ref| 
+      @repo.refs.each do |ref|
         ref_cache[ref.commit.id] ||= []
         ref_cache[ref.commit.id] << ref
       end

app/controllers/tags_controller.rb

 class TagsController < ApplicationController
-	def index
-		@tags = Project.tag_counts.order('count DESC')
-		@tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
+  def index
+    @tags = Project.tag_counts.order('count DESC')
+    @tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
 
-		respond_to do |format|
-			format.html
-			format.json { render json: @tags.limit(8).map {|t| t.name}}
-		end
-	end
+    respond_to do |format|
+      format.html
+      format.json { render json: @tags.limit(8).map {|t| t.name}}
+    end
+  end
 end

app/helpers/application_helper.rb

@@ -11,7 +11,7 @@ module ApplicationHelper
   end
 
   def body_class(default_class = nil)
-    main = content_for(:body_class).blank? ? 
+    main = content_for(:body_class).blank? ?
       default_class :
       content_for(:body_class)
 
@@ -42,7 +42,7 @@ module ApplicationHelper
     else
       "Never"
     end
-  rescue 
+  rescue
     "Never"
   end
 

app/helpers/dashboard_helper.rb

@@ -4,7 +4,7 @@ module DashboardHelper
     when "Issue" then project_issue_path(project, project.issues.find(object.id))
     when "Grit::Commit" then project_commit_path(project, project.repo.commits(object.id).first)
     when "Note"
-      then 
+      then
       note = object
       case note.noteable_type
       when "Issue" then project_issue_path(project, note.noteable_id)
@@ -12,9 +12,9 @@ module DashboardHelper
       when "Commit" then project_commit_path(project, :id => note.noteable_id)
       else wall_project_path(project)
       end
-    else wall_project_path(project) 
+    else wall_project_path(project)
     end
-  rescue 
+  rescue
     "#"
   end
 

app/models/issue.rb

@@ -11,8 +11,8 @@ class Issue < ActiveRecord::Base
   validates_presence_of :author_id
 
   delegate :name,
-           :email, 
-           :to => :author, 
+           :email,
+           :to => :author,
            :prefix => true
 
   validates :title,

app/models/note.rb

@@ -8,8 +8,8 @@ class Note < ActiveRecord::Base
     :class_name => "User"
 
   delegate :name,
-           :email, 
-           :to => :author, 
+           :email,
+           :to => :author,
            :prefix => true
 
   attr_protected :author, :author_id

app/models/project.rb

@@ -129,9 +129,9 @@ class Project < ActiveRecord::Base
     private_flag
   end
 
-  def last_activity 
+  def last_activity
     updates(1).first
-  rescue 
+  rescue
     nil
   end
 
@@ -140,7 +140,7 @@ class Project < ActiveRecord::Base
   end
 
   def updates(n = 3)
-    [ 
+    [
       fresh_commits(n),
       fresh_issues(n),
       fresh_notes(n)

app/models/repository.rb

@@ -9,7 +9,7 @@ class Repository
     @project = project
   end
 
-  def path 
+  def path
     @path ||= project.path
   end
 

app/models/user.rb

 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable,
+  devise :database_authenticatable, :token_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
@@ -25,6 +25,8 @@ class User < ActiveRecord::Base
     :foreign_key => :assignee_id,
     :dependent => :destroy
 
+  before_create :ensure_authentication_token
+  alias_attribute :private_token, :authentication_token
   scope :not_in_project, lambda { |project|  where("id not in (:ids)", :ids => project.users.map(&:id) ) }
 
   def identifier

app/views/admin/projects/_form.html.haml

 = form_for [:admin, @admin_project] do |f|
   -if @admin_project.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:" 
+      %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:"
       %ul
         - @admin_project.errors.full_messages.each do |msg|
           %li= msg
@@ -19,7 +19,6 @@
     %br
     = f.text_field :path
 
-
   .form-row
     = f.label :tag_list
     %br
@@ -36,4 +35,4 @@
 :javascript
   $(function(){
     taggifyForm();
-  })  
+  })

app/views/commits/index.atom.builder

+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
+  xml.title   "Recent commits to #{@project.name}:#{@ref}"
+  xml.link    :href => project_commits_url(@project, :atom, :ref => @ref), :rel => "self", :type => "application/atom+xml"
+  xml.link    :href => project_commits_url(@project), :rel => "alternate", :type => "text/html"
+  xml.id      project_commits_url(@project)
+  xml.updated @commits.first.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ") if @commits.any?
+
+  @commits.each do |commit|
+    xml.entry do
+      xml.id      project_commit_url(@project, :id => commit.id)
+      xml.link    :href => project_commit_url(@project, :id => commit.id)
+      xml.title   truncate(commit.safe_message, :length => 80)
+      xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
+      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(commit.author_email)
+      xml.author do |author|
+        xml.name commit.author_name
+        xml.email commit.author_email
+      end
+      xml.summary commit.safe_message
+    end
+  end
+end

app/views/commits/index.html.haml

@@ -6,7 +6,7 @@
 %h2.icon
   %span
   %d
-    = link_to project_commits_path(@project) do 
+    = link_to project_commits_path(@project) do
       = @project.name
     - if params[:path]
       \/
@@ -20,8 +20,6 @@
 .loading{ :style => "display:none;"}
   %center= image_tag "ajax-loader.gif"
 
-
-
 :javascript
   $(function(){
     CommitsList.init("#{@ref}", 20);

app/views/dashboard/index.html.haml

@@ -27,13 +27,13 @@
             %a.project-update{:href => dashboard_feed_path(project, update)}
               = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
               %span.update-title
-                - if update.kind_of?(Grit::Commit) 
+                - if update.kind_of?(Grit::Commit)
                   %span.right.tag.commit= update.head.name
                 = dashboard_feed_title(update)
               %span.update-author
                 %strong= update.author_name
                 authored
-                = time_ago_in_words(update.created_at) 
+                = time_ago_in_words(update.created_at)
                 ago
   / #news-feed
 / #dashboard-content

app/views/issues/_show.html.haml

@@ -18,7 +18,7 @@
         - if can? current_user, :write_issue, issue
           - if issue.closed
             = link_to 'Reopen', project_issue_path(@project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "cgray", :remote => true
-          - else 
+          - else
             = link_to 'Resolve', project_issue_path(@project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true
         - if can? current_user, :write_issue, issue
           = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true

app/views/issues/index.atom.builder

+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
+  xml.title   "#{@project.name} issues"
+  xml.link    :href => project_issues_url(@project, :atom), :rel => "self", :type => "application/atom+xml"
+  xml.link    :href => project_issues_url(@project), :rel => "alternate", :type => "text/html"
+  xml.id      project_issues_url(@project)
+  xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
+
+  @issues.each do |issue|
+    xml.entry do
+      xml.id      project_issue_url(@project, issue)
+      xml.link    :href => project_issue_url(@project, issue)
+      xml.title   truncate(issue.title, :length => 80)
+      xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
+      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
+      xml.author do |author|
+        xml.name issue.author_name
+        xml.email issue.author_email
+      end
+      xml.summary issue.title
+    end
+  end
+end

app/views/issues/index.html.haml

@@ -31,7 +31,6 @@
   var href       = $('.issue_search').parent().attr('action');
   var last_terms = '';
 
-
   var setIssueFilter = function(form, value){
     $.cookie('issue_filter', value, { expires: 140 });
     form.submit();

app/views/issues/show.html.haml

@@ -22,12 +22,12 @@
       %td
         = image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
         = @issue.assignee.name
-    %tr 
+    %tr
       %td Tags
       %td
         - if @issue.critical
           %span.tag.high critical
-        - else 
+        - else
           %span.tag.normal normal
 
         - if @issue.today?
@@ -42,7 +42,6 @@
         - else
           = check_box_tag "closed", 1, @issue.closed, :disabled => true
 
-
   - if can?(current_user, :write_issue, @issue)
     .clear
     %br

app/views/layouts/_head_panel.html.erb

@@ -10,7 +10,7 @@
 
     <div class="account-links">
       <%= link_to profile_path, :class => "username" do %>
-        <%#= current_user.name %> 
+        <%#= current_user.name %>
         My profile
       <% end %>
       <%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>

app/views/layouts/profile.html.haml

@@ -19,7 +19,7 @@
             %aside
               = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
               = link_to "Password", profile_password_path,  :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
-              = link_to keys_path,  :class => controller.controller_name == "keys" ? "current" : nil do 
+              = link_to keys_path,  :class => controller.controller_name == "keys" ? "current" : nil do
                 Keys
                 - unless current_user.keys.empty?
                   %span{ :class => "number" }= current_user.keys.count

app/views/layouts/project.html.haml

@@ -5,6 +5,10 @@
       GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
+    - if current_page?(tree_project_path(@project)) || current_page?(project_commits_path(@project))
+      = auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, :ref => @ref, :private_token => current_user.private_token), :title => "Recent commits to #{@project.name}:#{@ref}")
+    - if request.path == project_issues_path(@project)
+      = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
     = csrf_meta_tags
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";

app/views/notes/_form.html.haml

@@ -14,7 +14,7 @@
       %br
       %br
       = f.text_area :note,  :size => 255
-     
+
     %div.attach_holder
       %br
       = f.label :attachment

app/views/notes/_load.js.haml

@@ -4,7 +4,6 @@
     :plain
       NoteList.replace(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
 
-
   - elsif params[:last_id]
     :plain
       NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");

app/views/notes/_show.html.haml

@@ -7,7 +7,7 @@
       ago
     - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
       = link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note right"
-    
+
   %div.note-title
     = markdown(note.note)
     - if note.attachment.url

app/views/notify/new_issue_email.html.haml

@@ -10,9 +10,7 @@
       %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
       %td{:align => "left", :style => "padding: 20px 0 0;"}
         %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          = link_to project_issue_url(@project, @issue) do
+          = link_to project_issue_url(@project, @issue), :title => @issue.title do
             = "Issue ##{@issue.id.to_s}"
             = truncate(@issue.title, :length => 45)
         %br
-        %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          = @issue.content

app/views/projects/_feed.html.haml

@@ -5,11 +5,11 @@
   %span.update-author
     %strong= update.author_name
     authored
-    = time_ago_in_words(update.created_at) 
+    = time_ago_in_words(update.created_at)
     ago
   .right
     - klass = update.class.to_s.split("::").last.downcase
     %span.tag{ :class => klass }= klass
-    - if update.kind_of?(Grit::Commit) 
+    - if update.kind_of?(Grit::Commit)
       %span.tag.commit= update.head.name
 

app/views/projects/_form.html.haml

 = form_for(@project, :remote => true) do |f|
   %div.form_content
     - unless @project.new_record?
-      %h2.icon  
+      %h2.icon
         %span
         = @project.name
     - if @project.errors.any?
@@ -56,4 +56,4 @@
 :javascript
   $(function(){
     taggifyForm();
-  })  
+  })

app/views/projects/_list.html.haml

@@ -14,7 +14,6 @@
         = project.name
         .small-tags= tag_list project
 
-
       %td= truncate project.url_to_repo
       %td= project.code
       %td= check_box_tag "read",   1, project.readers.include?(current_user), :disabled => :disabled

app/views/projects/_refs.html.haml

 = form_tag destination, :method => :get, :class => "project-refs-form" do
   = select_tag "ref", grouped_options_refs, :onchange => "this.form.submit();", :class => "project-refs-select"
 
-
 :javascript
   $(function(){
     $('.project-refs-select').chosen();

app/views/projects/_tile.html.haml

@@ -2,7 +2,7 @@
   - projects.each_with_index do |project, i|
     %div.grid_1.projects_selector
       %div{ :class => "project-box ui-box ui-box-big" }
-        = link_to project_path(project) do 
+        = link_to project_path(project) do
           %h3= truncate(project.name, :length => 20)
         .data
           %p.title.repository.git_url_wrapper

app/views/projects/_tree.html.haml

-
 -#%a.right.button{:href => "#"} Download
 -#-if can? current_user, :admin_project, @project
   %a.right.button.blue{:href => "#"} EDIT
@@ -6,7 +5,7 @@
   %h2.icon
     %span
     %d
-      = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true do 
+      = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true do
         = @project.name
       - if params[:path]
         - part_path = ""

app/views/projects/index.html.haml

@@ -4,7 +4,7 @@
     .grid_4
       - if current_user.can_create_project?
         %a.grey-button.right{:href => new_project_path} Create new project
-      %h2.icon  
+      %h2.icon
         %span
         Projects
 

app/views/projects/new.html.haml

 - content_for(:body_class, "new-project-page")
 - content_for(:page_title) do
-	.new-project-hodler
-		.container
-			%h2.icon	
-				%span
-				New Project
+  .new-project-hodler
+    .container
+      %h2.icon  
+        %span
+        New Project
 
-			%div.clear
-			= render 'form' 
+      %div.clear
+      = render 'form'

app/views/snippets/index.html.haml

@@ -4,7 +4,7 @@
 
   %table.round-borders#snippets-table
     %thead
-      %th 
+      %th
     = render @snippets.fresh
 :javascript
   $('.delete-snippet').live('ajax:success', function() {

app/views/tags/index.html.haml

 - content_for(:body_class, "projects-page")
 - content_for(:page_title) do
   .grid_4
-    %h2  
+    %h2
       Tags
 
- 
   .tags-list
     - @tags.all.each do |tag|
       = link_to "#{tag.name}(#{tag.count})", tag_path(name)
-        
+

config/initializers/devise.rb

@@ -158,11 +158,11 @@ Devise.setup do |config|
 
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
+  config.token_authentication_key = :private_token
 
   # If true, authentication through token does not store user in session and needs
   # to be supplied on each request. Useful if you are using the token as API token.
-  # config.stateless_token = false
+  config.stateless_token = true
 
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for

config/routes.rb

@@ -3,7 +3,6 @@ Gitlab::Application.routes.draw do
   get 'tags'=> 'tags#index'
   get 'tags/:tag' => 'projects#index'
 
-
   namespace :admin do
     resources :users
     resources :projects
@@ -53,10 +52,8 @@ Gitlab::Application.routes.draw do
     resources :team_members
     resources :issues do
       collection do
-        post :sort
-      end
-      collection do
-        get :search
+        post  :sort
+        get   :search
       end
     end
     resources :notes, :only => [:create, :destroy]

db/migrate/20111027152724_issue_conten_to_note.rb

@@ -15,16 +15,16 @@ class IssueContenToNote < ActiveRecord::Migration
       if note.save
         issue.update_attributes(:content => nil)
         print "."
-      else 
+      else
         print "F"
       end
     end
 
     total = Issue.where("content is not null").count
 
-    if total > 0 
-      puts "content of #{total} issues were not migrated" 
-    else 
+    if total > 0
+      puts "content of #{total} issues were not migrated"
+    else
       puts "Done"
     end
   end

db/migrate/20111111093150_remove_content_from_issues.rb

+class RemoveContentFromIssues < ActiveRecord::Migration
+  def up
+    remove_column :issues, :content
+  end
+
+  def down
+    add_column :issues, :content, :text
+  end
+end

db/migrate/20111115063954_add_authentication_token_to_users.rb

+class AddAuthenticationTokenToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :authentication_token, :string
+  end
+end

db/schema.rb

@@ -11,11 +11,10 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111101222453) do
+ActiveRecord::Schema.define(:version => 20111115063954) do
 
   create_table "issues", :force => true do |t|
     t.string   "title"
-    t.text     "content"
     t.integer  "assignee_id"
     t.integer  "author_id"
     t.integer  "project_id"
@@ -104,6 +103,7 @@ ActiveRecord::Schema.define(:version => 20111101222453) do
     t.string   "skype",                                 :default => "",    :null => false
     t.string   "linkedin",                              :default => "",    :null => false
     t.string   "twitter",                               :default => "",    :null => false
+    t.string   "authentication_token"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true

lib/assets/javascripts/branch-graph.js

@@ -39,7 +39,7 @@ function branchGraph(holder) {
     var cuday = 0, cumonth = "";
     r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"});
     r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"});
-    
+
     for (mm = 0; mm < days.length; mm++) {
         if(days[mm] != null){
             if(cuday != days[mm][0]){
@@ -50,7 +50,7 @@ function branchGraph(holder) {
                 r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
                 cumonth = days[mm][1]
             }
-            
+
         }
     }
     for (i = 0; i < ii; i++) {
@@ -65,7 +65,7 @@ function branchGraph(holder) {
             }
             var t = r.text(x+5, y+5, shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666",
             title: longrefs, cursor: "pointer", rotation: "90"});
-            
+
             var textbox = t.getBBox();
             t.translate(textbox.height/-4,textbox.width/2);
         }
@@ -77,7 +77,7 @@ function branchGraph(holder) {
                 if (c.space == commits[i].space) {
                     r.path("M" + (x - 5) + "," + (y + .0001) + "L" + (15 + 20 * c.time) + "," + (y + .0001))
                     .attr({stroke: colors[c.space], "stroke-width": 2});
-                
+
                 } else if (c.space < commits[i].space) {
                     r.path(["M", x - 5, y + .0001, "l-5-2,0,4,5,-2C",x-5,y,x -17, y+2, x -20, y-10,"L", cx,y-10,cx , cy])
                     .attr({stroke: colors[commits[i].space], "stroke-width": 2});

lib/graph_commit.rb

@@ -12,20 +12,20 @@ class GraphCommit
     @_commit.send(m, *args, &block)
   end
 
-  # Method is adding time and space on the 
-  # list of commits. As well as returns date list 
+  # Method is adding time and space on the
+  # list of commits. As well as returns date list
   # corelated with time set on commits.
   #
   # @param [Array<GraphCommit>] comits to index
   #
-  # @return [Array<TimeDate>] list of commit dates corelated with time on commits 
+  # @return [Array<TimeDate>] list of commit dates corelated with time on commits
   def self.index_commits(commits)
     days, heads = [], []
     map = {}
 
     commits.reverse.each_with_index do |c,i|
       c.time = i
-      days[i] = c.committed_date 
+      days[i] = c.committed_date
       map[c.id] = c
       heads += c.refs unless c.refs.nil?
     end
@@ -35,7 +35,7 @@ class GraphCommit
     heads.sort! do |a,b|
       if a.name == "master"
         -1
-      elsif b.name == "master" 
+      elsif b.name == "master"
         1
       else
         b.commit.committed_date <=> a.commit.committed_date
@@ -45,7 +45,7 @@ class GraphCommit
     j = 0
     heads.each do |h|
       if map.include? h.commit.id then
-        j = mark_chain(j+=1, map[h.commit.id], map)        
+        j = mark_chain(j+=1, map[h.commit.id], map)
       end
     end
     days
@@ -55,15 +55,15 @@ class GraphCommit
   #
   # @param [Fixnum] space (row on the graph) to be set
   # @param [GraphCommit] the commit object.
-  # @param [Hash<String,GraphCommit>] map of commits 
+  # @param [Hash<String,GraphCommit>] map of commits
   #
-  # @return [Fixnum] max space used.	
+  # @return [Fixnum] max space used.  
   def self.mark_chain(mark, commit, map)
     commit.space = mark  if commit.space == 0
     m1 = mark - 1
     marks = commit.parents.collect do |p|
       if map.include? p.id  and map[p.id].space == 0 then
-        mark_chain(m1 += 1, map[p.id],map) 
+        mark_chain(m1 += 1, map[p.id],map)
       else
         m1 + 1
       end
@@ -71,5 +71,5 @@ class GraphCommit
     marks << mark
     marks.compact.max
   end
-  
+
 end

spec/models/project_spec.rb

@@ -62,10 +62,10 @@ describe Project do
     end
   end
 
-  describe "updates" do 
+  describe "updates" do
     let(:project) { Factory :project }
 
-    before do 
+    before do
       @issue = Factory :issue,
         :project => project,
         :author => Factory(:user),
@@ -86,10 +86,10 @@ describe Project do
     end
   end
 
-  describe "last_activity" do 
+  describe "last_activity" do
     let(:project) { Factory :project }
 
-    before do 
+    before do
       @note = Factory :note,
         :project => project,
         :author => Factory(:user)
@@ -99,7 +99,7 @@ describe Project do
     it { project.last_activity_date.to_s.should == @note.created_at.to_s }
   end
 
-  describe "fresh commits" do 
+  describe "fresh commits" do
     let(:project) { Factory :project }
 
     it { project.fresh_commits(3).count.should == 3 }

spec/models/user_spec.rb

@@ -19,15 +19,20 @@ describe User do
     user.identifier.should == "test_mail.com"
   end
 
+  it "should have authentication token" do
+    user = Factory(:user)
+    user.authentication_token.should_not == ""
+  end
+
   describe "dependent" do
-    before do 
+    before do
       @user = Factory :user
-      @note = Factory :note, 
+      @note = Factory :note,
         :author => @user,
         :project => Factory(:project)
     end
 
-    it "should destroy all notes with user" do 
+    it "should destroy all notes with user" do
       Note.find_by_id(@note.id).should_not be_nil
       @user.destroy
       Note.find_by_id(@note.id).should be_nil

spec/requests/commits_spec.rb

@@ -25,6 +25,25 @@ describe "Commits" do
       page.should have_content(commit.author)
       page.should have_content(commit.message)
     end
+
+    it "should render atom feed" do
+      visit project_commits_path(project, :atom)
+
+      page.response_headers['Content-Type'].should have_content("application/atom+xml")
+      page.body.should have_selector("title", :text => "Recent commits to #{project.name}")
+      page.body.should have_selector("author email", :text => commit.author_email)
+      page.body.should have_selector("entry summary", :text => commit.message)
+    end
+
+    it "should render atom feed via private token" do
+      logout
+      visit project_commits_path(project, :atom, :private_token => @user.private_token)
+
+      page.response_headers['Content-Type'].should have_content("application/atom+xml")
+      page.body.should have_selector("title", :text => "Recent commits to #{project.name}")
+      page.body.should have_selector("author email", :text => commit.author_email)
+      page.body.should have_selector("entry summary", :text => commit.message)
+    end
   end
 
   describe "GET /commits/:id" do

spec/requests/dashboard_spec.rb

@@ -15,13 +15,13 @@ describe "Dashboard" do
     end
 
     it "should have projects panel" do
-      within ".project-list"  do 
+      within ".project-list"  do
         page.should have_content(@project.name)
       end
     end
-    
+
     it "should have news feed" do
-      within "#news-feed"  do 
+      within "#news-feed"  do
         page.should have_content("master")
         page.should have_content(@project.commit.author.name)
         page.should have_content(@project.commit.safe_message)

spec/requests/issues_spec.rb

@@ -27,6 +27,25 @@ describe "Issues" do
     it { should have_content(@issue.project.name) }
     it { should have_content(@issue.assignee.name) }
 
+    it "should render atom feed" do
+      visit project_issues_path(project, :atom)
+
+      page.response_headers['Content-Type'].should have_content("application/atom+xml")
+      page.body.should have_selector("title", :text => "#{project.name} issues")
+      page.body.should have_selector("author email", :text => @issue.author_email)
+      page.body.should have_selector("entry summary", :text => @issue.title)
+    end
+
+    it "should render atom feed via private token" do
+      logout
+      visit project_issues_path(project, :atom, :private_token => @user.private_token)
+
+      page.response_headers['Content-Type'].should have_content("application/atom+xml")
+      page.body.should have_selector("title", :text => "#{project.name} issues")
+      page.body.should have_selector("author email", :text => @issue.author_email)
+      page.body.should have_selector("entry summary", :text => @issue.title)
+    end
+
     describe "Destroy" do
       before do
         # admin access to remove issue
@@ -81,13 +100,13 @@ describe "Issues" do
     end
 
     describe "fill in" do
-      describe 'assign to me' do 
+      describe 'assign to me' do
         before do
           fill_in "issue_title", :with => "bug 345"
           click_link "Select user"
           within "#issue_assignee_id-menu" do
             click_link @user.name
-          end 
+          end
         end
 
         it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
@@ -107,13 +126,13 @@ describe "Issues" do
         end
       end
 
-      describe 'assign to other' do 
+      describe 'assign to other' do
         before do
           fill_in "issue_title", :with => "bug 345"
           click_link "Select user"
           within "#issue_assignee_id-menu" do
             click_link @user2.name
-          end 
+          end
         end
 
         it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
@@ -145,7 +164,7 @@ describe "Issues" do
     end
   end
 
-  describe "Show issue" do 
+  describe "Show issue" do
     before do
       @issue = Factory :issue,
         :author => @user,
@@ -205,7 +224,7 @@ describe "Issues" do
         @issue.save
       end
     end
-      
+
     it "should be able to search on different statuses" do
       @issue = Issue.first
       @issue.closed = true
@@ -214,13 +233,13 @@ describe "Issues" do
       visit project_issues_path(project)
       choose 'closed_issues'
       fill_in 'issue_search', :with => 'foobar'
-      
+
       page.should have_content 'foobar'
       page.should_not have_content 'foobar2'
       page.should_not have_content 'gitlab'
     end
 
-    it "should search for term and return the correct results" do  
+    it "should search for term and return the correct results" do
       visit project_issues_path(project)
       fill_in 'issue_search', :with => 'foobar'
 

spec/requests/projects_spec.rb

@@ -73,7 +73,7 @@ describe "Projects" do
     end
 
     it "should beahave like activities page" do
-      within ".project-update"  do 
+      within ".project-update"  do
         page.should have_content("master")
         page.should have_content(@project.commit.author.name)
         page.should have_content(@project.commit.safe_message)

spec/requests/tags_spec.rb

@@ -10,7 +10,6 @@ describe "Tags" do
   #   end
   # end
 
-
   describe "GET '/tags.json'" do
     before do
      @project = Factory :project
@@ -20,12 +19,9 @@ describe "Tags" do
      visit '/tags.json'
     end
 
-
     it "should contains tags" do
       page.should have_content('demo1')
     end
 end
 
-
-
 end

spec/requests/top_panel_spec.rb

@@ -7,7 +7,7 @@ describe "Top Panel", :js => true do
     before do
       visit projects_path
       fill_in "search", :with => "Ke"
-      within ".ui-autocomplete" do 
+      within ".ui-autocomplete" do
         find(:xpath, "//a[.=\"Keys\"]").click
       end
     end
@@ -24,7 +24,7 @@ describe "Top Panel", :js => true do
       visit project_path(@project)
 
       fill_in "search", :with => "Commi"
-      within ".ui-autocomplete" do 
+      within ".ui-autocomplete" do
         find(:xpath, "//a[.=\"#{@project.code} / Commits\"]").click
       end
     end