From 5700842ba8ca2f3100395a9fb98c759e78e63d96 Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Wed, 15 Oct 2014 02:21:21 -0500
Subject: Add Markdown preview to more forms

Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
---
 app/controllers/projects_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b3380a6ff23..aca091e7d2c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -183,6 +183,10 @@ class ProjectsController < ApplicationController
     render json: { star_count: @project.star_count }
   end
 
+  def markdown_preview
+    render text: view_context.markdown(params[:md_text])
+  end
+
   private
 
   def upload_path
-- 
cgit v1.2.1


From b011052ce7ae714e762a611bad1b9e8866fdf7cd Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 19 Oct 2014 11:46:57 +0200
Subject: Remove unused authenticate_user from project#show

Redundant with the authorize_read_project! filter
---
 app/controllers/projects_controller.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b3380a6ff23..42ab6d3d133 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -53,8 +53,6 @@ class ProjectsController < ApplicationController
       return
     end
 
-    return authenticate_user! unless @project.public? || current_user
-
     limit = (params[:limit] || 20).to_i
     @events = @project.events.recent
     @events = event_filter.apply_filter(@events)
-- 
cgit v1.2.1


From 6f34d40436531029228e78d7a55a0e3982dbf89e Mon Sep 17 00:00:00 2001
From: Valery Sizov <admin@example12.com>
Date: Wed, 5 Nov 2014 11:04:08 +0200
Subject: remove auth duplication

---
 app/controllers/projects_controller.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f81fc29677b..5a80a2ca465 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,7 +4,6 @@ class ProjectsController < ApplicationController
   before_filter :repository, except: [:new, :create]
 
   # Authorize
-  before_filter :authorize_read_project!, except: [:index, :new, :create]
   before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive, :retry_import]
 
   layout 'navless', only: [:new, :create, :fork]
-- 
cgit v1.2.1


From e08e405ac4c448d8b720ed2ef6181c15e3f3dfc1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 13 Nov 2014 22:06:19 +0200
Subject: Select namespace where to fork project

Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects_controller.rb | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b5910c902e4..b3181fa310e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -111,22 +111,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def fork
-    @forked_project = ::Projects::ForkService.new(project, current_user).execute
-
-    respond_to do |format|
-      format.html do
-        if @forked_project.saved? && @forked_project.forked?
-          redirect_to(@forked_project, notice: 'Project was successfully forked.')
-        else
-          @title = 'Fork project'
-          render "fork"
-        end
-      end
-      format.js
-    end
-  end
-
   def autocomplete_sources
     note_type = params['type']
     note_id = params['type_id']
-- 
cgit v1.2.1


From 674cbe939cb65e67479e0d73f4004e52c4546791 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 29 Nov 2014 21:34:18 +0200
Subject: Dont allow project creation without repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b3181fa310e..ead0127b515 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -19,10 +19,11 @@ class ProjectsController < ApplicationController
 
   def create
     @project = ::Projects::CreateService.new(current_user, project_params).execute
-    flash[:notice] = 'Project was successfully created.' if @project.saved?
 
-    respond_to do |format|
-      format.js
+    if @project.saved?
+      redirect_to project_path(@project), notice: 'Project was successfully created.'
+    else
+      render 'new'
     end
   end
 
-- 
cgit v1.2.1


From 9d937293136afd7994218b8dc72bb0956fb19eeb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 30 Nov 2014 00:50:25 +0200
Subject: Move projects import to separate resource. Add bare repo creation to
 repository controller

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects_controller.rb | 39 ++++++++++------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ead0127b515..fbd9e5f2a5b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -4,7 +4,7 @@ class ProjectsController < ApplicationController
   before_filter :repository, except: [:new, :create]
 
   # Authorize
-  before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive, :retry_import]
+  before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
 
   layout 'navless', only: [:new, :create, :fork]
   before_filter :set_title, only: [:new, :create]
@@ -48,7 +48,7 @@ class ProjectsController < ApplicationController
 
   def show
     if @project.import_in_progress?
-      redirect_to import_project_path(@project)
+      redirect_to project_import_path(@project)
       return
     end
 
@@ -61,37 +61,20 @@ class ProjectsController < ApplicationController
 
     respond_to do |format|
       format.html do
-        if @project.empty_repo?
-          render "projects/empty", layout: user_layout
+        if @project.repository_exists?
+          if @project.empty_repo?
+            render "projects/empty", layout: user_layout
+          else
+            @last_push = current_user.recent_push(@project.id) if current_user
+            render :show, layout: user_layout
+          end
         else
-          @last_push = current_user.recent_push(@project.id) if current_user
-          render :show, layout: user_layout
+          render "projects/no_repo", layout: user_layout
         end
       end
-      format.json { pager_json("events/_events", @events.count) }
-    end
-  end
-
-  def import
-    if @project.import_finished?
-      redirect_to @project
-      return
-    end
-  end
-
-  def retry_import
-    unless @project.import_failed?
-      redirect_to import_project_path(@project)
-    end
 
-    @project.import_url = project_params[:import_url]
-
-    if @project.save
-      @project.reload
-      @project.import_retry
+      format.json { pager_json("events/_events", @events.count) }
     end
-
-    redirect_to import_project_path(@project)
   end
 
   def destroy
-- 
cgit v1.2.1


From c4a56797a4c3a818c0ac6e57e2ea3acb76f3f1eb Mon Sep 17 00:00:00 2001
From: skv-headless <skv-headless@yandex.ru>
Date: Mon, 15 Dec 2014 16:10:56 +0300
Subject: transfer error handler

---
 app/controllers/projects_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fcff6952d38..e541b6fd872 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -44,6 +44,9 @@ class ProjectsController < ApplicationController
 
   def transfer
     ::Projects::TransferService.new(project, current_user, project_params).execute
+    if @project.errors[:namespace_id].present?
+      flash[:alert] = @project.errors[:namespace_id].first
+    end
   end
 
   def show
-- 
cgit v1.2.1


From 1511999d88d4a6a7c8a42f93dff93097b92682b1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 22 Jan 2015 17:51:35 -0800
Subject: Faster autocomplete for users/issues/emojiis

Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
---
 app/controllers/projects_controller.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e541b6fd872..7fc283ef3d4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -101,11 +101,20 @@ class ProjectsController < ApplicationController
   def autocomplete_sources
     note_type = params['type']
     note_id = params['type_id']
+    autocomplete = ::Projects::AutocompleteService.new(@project)
     participants = ::Projects::ParticipantsService.new(@project).execute(note_type, note_id)
+
+    emojis = Emoji.names.map do |e|
+      {
+        name: e,
+        path: view_context.image_url("emoji/#{e}.png")
+      }
+    end
+
     @suggestions = {
-      emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } },
-      issues: @project.issues.select([:iid, :title, :description]),
-      mergerequests: @project.merge_requests.select([:iid, :title, :description]),
+      emojis: emojis,
+      issues: autocomplete.issues,
+      mergerequests: autocomplete.merge_requests,
       members: participants
     }
 
-- 
cgit v1.2.1


From a42d84eca30956ca9255f93e6803efb43e1874cf Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 23 Jan 2015 14:38:20 -0800
Subject: Faster autocomplete without unused description

---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7fc283ef3d4..ae9d942853d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -119,7 +119,7 @@ class ProjectsController < ApplicationController
     }
 
     respond_to do |format|
-      format.json { render :json => @suggestions }
+      format.json { render json: @suggestions }
     end
   end
 
-- 
cgit v1.2.1


From 893a68baf34bce26cb7cab0bc486b0b791308176 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 23 Jan 2015 16:17:27 -0800
Subject: Cache autocomplete or emojis

---
 app/controllers/projects_controller.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ae9d942853d..89296b9aa4a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -104,15 +104,8 @@ class ProjectsController < ApplicationController
     autocomplete = ::Projects::AutocompleteService.new(@project)
     participants = ::Projects::ParticipantsService.new(@project).execute(note_type, note_id)
 
-    emojis = Emoji.names.map do |e|
-      {
-        name: e,
-        path: view_context.image_url("emoji/#{e}.png")
-      }
-    end
-
     @suggestions = {
-      emojis: emojis,
+      emojis: autocomplete_emojis,
       issues: autocomplete.issues,
       mergerequests: autocomplete.merge_requests,
       members: participants
@@ -189,4 +182,15 @@ class ProjectsController < ApplicationController
       :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id
     )
   end
+
+  def autocomplete_emojis
+    Rails.cache.fetch("autocomplete-emoji-#{Emoji::VERSION}") do
+      Emoji.names.map do |e|
+        {
+          name: e,
+          path: view_context.image_url("emoji/#{e}.png")
+        }
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From 70c44a0da2bdeead90a99fe79e7c047d38b8ca5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Mon, 19 Jan 2015 21:37:20 +0100
Subject: Fix tests, merge conflicts, some minor issues and make the project
 avatar feature mergable

---
 app/controllers/projects_controller.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 89296b9aa4a..ebe48265c63 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -14,7 +14,7 @@ class ProjectsController < ApplicationController
   end
 
   def edit
-    render 'edit', layout: "project_settings"
+    render 'edit', layout: 'project_settings'
   end
 
   def create
@@ -36,7 +36,7 @@ class ProjectsController < ApplicationController
         format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
         format.js
       else
-        format.html { render "edit", layout: "project_settings" }
+        format.html { render 'edit', layout: 'project_settings' }
         format.js
       end
     end
@@ -66,17 +66,17 @@ class ProjectsController < ApplicationController
       format.html do
         if @project.repository_exists?
           if @project.empty_repo?
-            render "projects/empty", layout: user_layout
+            render 'projects/empty', layout: user_layout
           else
             @last_push = current_user.recent_push(@project.id) if current_user
             render :show, layout: user_layout
           end
         else
-          render "projects/no_repo", layout: user_layout
+          render 'projects/no_repo', layout: user_layout
         end
       end
 
-      format.json { pager_json("events/_events", @events.count) }
+      format.json { pager_json('events/_events', @events.count) }
     end
   end
 
@@ -87,9 +87,9 @@ class ProjectsController < ApplicationController
 
     respond_to do |format|
       format.html do
-        flash[:alert] = "Project deleted."
+        flash[:alert] = 'Project deleted.'
 
-        if request.referer.include?("/admin")
+        if request.referer.include?('/admin')
           redirect_to admin_projects_path
         else
           redirect_to projects_dashboard_path
@@ -141,7 +141,7 @@ class ProjectsController < ApplicationController
       if link_to_image
         format.json { render json: { link: link_to_image } }
       else
-        format.json { render json: "Invalid file.", status: :unprocessable_entity }
+        format.json { render json: 'Invalid file.', status: :unprocessable_entity }
       end
     end
   end
@@ -172,14 +172,14 @@ class ProjectsController < ApplicationController
   end
 
   def user_layout
-    current_user ? "projects" : "public_projects"
+    current_user ? 'projects' : 'public_projects'
   end
 
   def project_params
     params.require(:project).permit(
       :name, :path, :description, :issues_tracker, :tag_list,
       :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
-      :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id
+      :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar
     )
   end
 
-- 
cgit v1.2.1


From 9910b7ff99c3d7f89f512c1915ce40ed0c1696e3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 4 Feb 2015 17:10:39 +0100
Subject: Allow groups to be mentioned.

Resolves #1673.
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ebe48265c63..462ab3d4749 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
     note_type = params['type']
     note_id = params['type_id']
     autocomplete = ::Projects::AutocompleteService.new(@project)
-    participants = ::Projects::ParticipantsService.new(@project).execute(note_type, note_id)
+    participants = ::Projects::ParticipantsService.new(@project, current_user).execute(note_type, note_id)
 
     @suggestions = {
       emojis: autocomplete_emojis,
-- 
cgit v1.2.1


From 76aad9b76ed756ca9ba2cbcdb399c815e542b3ae Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Sat, 24 Jan 2015 11:02:58 -0700
Subject: Upgrade to Rails 4.1.9

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
---
 app/controllers/projects_controller.rb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 462ab3d4749..cf039d5f132 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -21,7 +21,10 @@ class ProjectsController < ApplicationController
     @project = ::Projects::CreateService.new(current_user, project_params).execute
 
     if @project.saved?
-      redirect_to project_path(@project), notice: 'Project was successfully created.'
+      redirect_to(
+        namespace_project_path(@project.namespace, @project),
+        notice: 'Project was successfully created.'
+      )
     else
       render 'new'
     end
@@ -33,7 +36,12 @@ class ProjectsController < ApplicationController
     respond_to do |format|
       if status
         flash[:notice] = 'Project was successfully updated.'
-        format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
+        format.html do
+          redirect_to(
+            edit_namespace_project_path(@project.namespace, @project),
+            notice: 'Project was successfully updated.'
+          )
+        end
         format.js
       else
         format.html { render 'edit', layout: 'project_settings' }
@@ -43,7 +51,8 @@ class ProjectsController < ApplicationController
   end
 
   def transfer
-    ::Projects::TransferService.new(project, current_user, project_params).execute
+    transfer_params = params.permit(:new_namespace_id)
+    ::Projects::TransferService.new(project, current_user, transfer_params).execute
     if @project.errors[:namespace_id].present?
       flash[:alert] = @project.errors[:namespace_id].first
     end
@@ -51,7 +60,7 @@ class ProjectsController < ApplicationController
 
   def show
     if @project.import_in_progress?
-      redirect_to project_import_path(@project)
+      redirect_to namespace_project_import_path(@project.namespace, @project)
       return
     end
 
@@ -90,7 +99,7 @@ class ProjectsController < ApplicationController
         flash[:alert] = 'Project deleted.'
 
         if request.referer.include?('/admin')
-          redirect_to admin_projects_path
+          redirect_to admin_namespace_projects_path
         else
           redirect_to projects_dashboard_path
         end
@@ -121,7 +130,7 @@ class ProjectsController < ApplicationController
     @project.archive!
 
     respond_to do |format|
-      format.html { redirect_to @project }
+      format.html { redirect_to namespace_project_path(@project.namespace, @project) }
     end
   end
 
@@ -130,7 +139,7 @@ class ProjectsController < ApplicationController
     @project.unarchive!
 
     respond_to do |format|
-      format.html { redirect_to @project }
+      format.html { redirect_to namespace_project_path(@project.namespace, @project) }
     end
   end
 
-- 
cgit v1.2.1


From 9bf8480b4a0d3ea6e284c4bd8bf26243f3f3f6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Sat, 14 Feb 2015 16:04:45 +0100
Subject: Generalize the image upload in markdown

This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
---
 app/controllers/projects_controller.rb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 462ab3d4749..b430278903a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -134,12 +134,13 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def upload_image
-    link_to_image = ::Projects::ImageService.new(repository, params, root_url).execute
+  def upload_file
+    link_to_file = ::Projects::FileService.new(repository, params, root_url).
+      execute
 
     respond_to do |format|
-      if link_to_image
-        format.json { render json: { link: link_to_image } }
+      if link_to_file
+        format.json { render json: { link: link_to_file } }
       else
         format.json { render json: 'Invalid file.', status: :unprocessable_entity }
       end
@@ -158,13 +159,8 @@ class ProjectsController < ApplicationController
 
   private
 
-  def upload_path
-    base_dir = FileUploader.generate_dir
-    File.join(repository.path_with_namespace, base_dir)
-  end
-
-  def accepted_images
-    %w(png jpg jpeg gif)
+  def invalid_file(error)
+    render json: { message: error.message }, status: :internal_server_error
   end
 
   def set_title
-- 
cgit v1.2.1


From d2ebdf664b42d4fac6b2e060ef79aa9fe0b0e72d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 16 Feb 2015 19:58:40 +0100
Subject: Refactor.

---
 app/controllers/projects_controller.rb | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b430278903a..9be66b6b9f9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -134,19 +134,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def upload_file
-    link_to_file = ::Projects::FileService.new(repository, params, root_url).
-      execute
-
-    respond_to do |format|
-      if link_to_file
-        format.json { render json: { link: link_to_file } }
-      else
-        format.json { render json: 'Invalid file.', status: :unprocessable_entity }
-      end
-    end
-  end
-
   def toggle_star
     current_user.toggle_star(@project)
     @project.reload
@@ -159,10 +146,6 @@ class ProjectsController < ApplicationController
 
   private
 
-  def invalid_file(error)
-    render json: { message: error.message }, status: :internal_server_error
-  end
-
   def set_title
     @title = 'New Project'
   end
-- 
cgit v1.2.1


From a8a328b1513c0aa442faaf8e8dd6f06f86ac3211 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 00:16:42 -0800
Subject: DB performance improvements to GitLab

---
 app/controllers/projects_controller.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 462ab3d4749..fb58ddd06e7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -5,9 +5,10 @@ class ProjectsController < ApplicationController
 
   # Authorize
   before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
+  before_filter :set_title, only: [:new, :create]
+  before_filter :event_filter, only: :show
 
   layout 'navless', only: [:new, :create, :fork]
-  before_filter :set_title, only: [:new, :create]
 
   def new
     @project = Project.new
@@ -56,9 +57,6 @@ class ProjectsController < ApplicationController
     end
 
     limit = (params[:limit] || 20).to_i
-    @events = @project.events.recent
-    @events = event_filter.apply_filter(@events)
-    @events = @events.limit(limit).offset(params[:offset] || 0)
 
     @show_star = !(current_user && current_user.starred?(@project))
 
@@ -76,7 +74,12 @@ class ProjectsController < ApplicationController
         end
       end
 
-      format.json { pager_json('events/_events', @events.count) }
+      format.json do
+        @events = @project.events.recent
+        @events = event_filter.apply_filter(@events).includes(:target, project: :namespace)
+        @events = @events.limit(limit).offset(params[:offset] || 0)
+        pager_json('events/_events', @events.count)
+      end
     end
   end
 
-- 
cgit v1.2.1


From 63f11a68c5e9edf36d062bd4f029d81a0861ef82 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 09:38:46 -0800
Subject: Fix event loading with associations

---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fb58ddd06e7..b0fde88babc 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -76,7 +76,7 @@ class ProjectsController < ApplicationController
 
       format.json do
         @events = @project.events.recent
-        @events = event_filter.apply_filter(@events).includes(:target, project: :namespace)
+        @events = event_filter.apply_filter(@events).with_associations
         @events = @events.limit(limit).offset(params[:offset] || 0)
         pager_json('events/_events', @events.count)
       end
-- 
cgit v1.2.1


From 746dd89ab010299f731c195082087d32f25698df Mon Sep 17 00:00:00 2001
From: DJ Mountney <dmountney@perforce.com>
Date: Mon, 23 Feb 2015 16:19:03 -0800
Subject: Fix 404 when deleting a project

The deletion from the admin section was redirecting to the wrong address.
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 38341b1c8c6..d1583e6ebfb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
         flash[:alert] = 'Project deleted.'
 
         if request.referer.include?('/admin')
-          redirect_to admin_namespace_projects_path
+          redirect_to admin_namespaces_projects_path
         else
           redirect_to projects_dashboard_path
         end
-- 
cgit v1.2.1


From 1da71cc520dd09098d8f756de3f58b8e2f153fcd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Feb 2015 19:34:16 -0800
Subject: Introduce shortcuts for routing helpers

---
 app/controllers/projects_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8a055cc2a36..5486a97e51d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -23,7 +23,7 @@ class ProjectsController < ApplicationController
 
     if @project.saved?
       redirect_to(
-        namespace_project_path(@project.namespace, @project),
+        project_path(@project),
         notice: 'Project was successfully created.'
       )
     else
@@ -39,7 +39,7 @@ class ProjectsController < ApplicationController
         flash[:notice] = 'Project was successfully updated.'
         format.html do
           redirect_to(
-            edit_namespace_project_path(@project.namespace, @project),
+            edit_project_path(@project),
             notice: 'Project was successfully updated.'
           )
         end
@@ -133,7 +133,7 @@ class ProjectsController < ApplicationController
     @project.archive!
 
     respond_to do |format|
-      format.html { redirect_to namespace_project_path(@project.namespace, @project) }
+      format.html { redirect_to project_path(@project) }
     end
   end
 
@@ -142,7 +142,7 @@ class ProjectsController < ApplicationController
     @project.unarchive!
 
     respond_to do |format|
-      format.html { redirect_to namespace_project_path(@project.namespace, @project) }
+      format.html { redirect_to project_path(@project) }
     end
   end
 
-- 
cgit v1.2.1