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/notes_controller.rb | 4 ----
 app/controllers/projects_controller.rb       | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 7b08b79d236..2f1d631c14a 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -61,10 +61,6 @@ class Projects::NotesController < Projects::ApplicationController
     end
   end
 
-  def preview
-    render text: view_context.markdown(params[:note])
-  end
-
   private
 
   def note
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')

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/base_tree_controller.rb    | 1 -
 app/controllers/projects/blame_controller.rb        | 1 -
 app/controllers/projects/blob_controller.rb         | 1 -
 app/controllers/projects/branches_controller.rb     | 1 -
 app/controllers/projects/commit_controller.rb       | 1 -
 app/controllers/projects/commits_controller.rb      | 1 -
 app/controllers/projects/compare_controller.rb      | 1 -
 app/controllers/projects/graphs_controller.rb       | 1 -
 app/controllers/projects/network_controller.rb      | 1 -
 app/controllers/projects/raw_controller.rb          | 1 -
 app/controllers/projects/refs_controller.rb         | 1 -
 app/controllers/projects/repositories_controller.rb | 1 -
 app/controllers/projects/tags_controller.rb         | 2 --
 app/controllers/projects_controller.rb              | 1 -
 14 files changed, 15 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/base_tree_controller.rb b/app/controllers/projects/base_tree_controller.rb
index 56c306063c8..a7b1b7b40e8 100644
--- a/app/controllers/projects/base_tree_controller.rb
+++ b/app/controllers/projects/base_tree_controller.rb
@@ -1,7 +1,6 @@
 class Projects::BaseTreeController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 end
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index bad06e7aa2d..367d1295f34 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -3,7 +3,6 @@ class Projects::BlameController < Projects::ApplicationController
   include ExtractsPath
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 04aa044001e..2412800c493 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -3,7 +3,6 @@ class Projects::BlobController < Projects::ApplicationController
   include ExtractsPath
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
   before_filter :authorize_push_code!, only: [:destroy]
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 9f50660a5ad..9ebd498e7fa 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -1,6 +1,5 @@
 class Projects::BranchesController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :require_non_empty_project
 
   before_filter :authorize_download_code!
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index cf05e6ea220..dac858d8e16 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -3,7 +3,6 @@
 # Not to be confused with CommitsController, plural.
 class Projects::CommitController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
   before_filter :commit
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 53a0d063d8e..9476b6c0284 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -4,7 +4,6 @@ class Projects::CommitsController < Projects::ApplicationController
   include ExtractsPath
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 6d944025598..ffb8c2e4af1 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -1,6 +1,5 @@
 class Projects::CompareController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index 21d3970d65a..4a318cb7d56 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -1,6 +1,5 @@
 class Projects::GraphsController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index 009089ee639..ada1aed0df7 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -3,7 +3,6 @@ class Projects::NetworkController < Projects::ApplicationController
   include ApplicationHelper
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index f4fdd616c50..fdbc4c5a098 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -3,7 +3,6 @@ class Projects::RawController < Projects::ApplicationController
   include ExtractsPath
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index 9ac189a78b3..5d9336bdc49 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -2,7 +2,6 @@ class Projects::RefsController < Projects::ApplicationController
   include ExtractsPath
 
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 6d8ef0f1ac8..bcd14a1c847 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -1,6 +1,5 @@
 class Projects::RepositoriesController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 94794fb5dd0..162ddef0fec 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -1,8 +1,6 @@
 class Projects::TagsController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_project!
   before_filter :require_non_empty_project
-
   before_filter :authorize_download_code!
   before_filter :authorize_push_code!, only: [:create]
   before_filter :authorize_admin_project!, only: [:destroy]
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 334fe86574227433bd2909577c5955c40721d509 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 13 Nov 2014 16:20:43 +0100
Subject: Sanitize branch name and ref name

---
 app/controllers/projects/branches_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 9ebd498e7fa..cff1a907dc2 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -1,4 +1,5 @@
 class Projects::BranchesController < Projects::ApplicationController
+  include ActionView::Helpers::SanitizeHelper
   # Authorize
   before_filter :require_non_empty_project
 
@@ -16,8 +17,10 @@ class Projects::BranchesController < Projects::ApplicationController
   end
 
   def create
+    branch_name = sanitize(strip_tags(params[:branch_name]))
+    ref = sanitize(strip_tags(params[:ref]))
     result = CreateBranchService.new(project, current_user).
-        execute(params[:branch_name], params[:ref])
+        execute(branch_name, ref)
 
     if result[:status] == :success
       @branch = result[:branch]
-- 
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/forks_controller.rb | 22 ++++++++++++++++++++++
 app/controllers/projects_controller.rb       | 16 ----------------
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 app/controllers/projects/forks_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
new file mode 100644
index 00000000000..a0481d11582
--- /dev/null
+++ b/app/controllers/projects/forks_controller.rb
@@ -0,0 +1,22 @@
+class Projects::ForksController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_download_code!
+  before_filter :require_non_empty_project
+
+  def new
+    @namespaces = current_user.manageable_namespaces
+    @namespaces.delete(@project.namespace)
+  end
+
+  def create
+    namespace = Namespace.find(params[:namespace_id])
+    @forked_project = ::Projects::ForkService.new(project, current_user, namespace: namespace).execute
+
+    if @forked_project.saved? && @forked_project.forked?
+      redirect_to(@forked_project, notice: 'Project was successfully forked.')
+    else
+      @title = 'Fork project'
+      render :error
+    end
+  end
+end
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 1353f9aa643f86a3f38f3d2dfa8666d3d942293e Mon Sep 17 00:00:00 2001
From: Daniel Aquino <daniel.aquino@nasdaqomx.com>
Date: Sat, 8 Nov 2014 23:04:31 -0600
Subject: HipChat service: support custom servers

HipChat allows users to run their own private servers and to be able to
support those we must connect to the correct URL when using one of these
custom servers.
---
 app/controllers/projects/services_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index a5f30dcfd9d..c50a1f1e75b 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -42,7 +42,7 @@ class Projects::ServicesController < Projects::ApplicationController
       :title, :token, :type, :active, :api_key, :subdomain,
       :room, :recipients, :project_url, :webhook,
       :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
-      :build_key
+      :build_key, :server
     )
   end
 end
-- 
cgit v1.2.1


From e683d9c087cc503cd8cb11214ddf265897e726c0 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 20 Nov 2014 18:18:16 +0200
Subject: Possibility to create Milestones or Labels when Issues are disabled

---
 app/controllers/projects/milestones_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index d338cdedfaf..f362f449e70 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -103,7 +103,9 @@ class Projects::MilestonesController < Projects::ApplicationController
   end
 
   def module_enabled
-    return render_404 unless @project.issues_enabled
+    unless @project.issues_enabled || @project.merge_requests_enabled
+      return render_404
+    end
   end
 
   def milestone_params
-- 
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')

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/imports_controller.rb     | 49 ++++++++++++++++++++++
 .../projects/repositories_controller.rb            |  9 +++-
 app/controllers/projects_controller.rb             | 39 +++++------------
 3 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 app/controllers/projects/imports_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
new file mode 100644
index 00000000000..b8350642804
--- /dev/null
+++ b/app/controllers/projects/imports_controller.rb
@@ -0,0 +1,49 @@
+class Projects::ImportsController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_admin_project!
+  before_filter :require_no_repo
+  before_filter :redirect_if_progress, except: :show
+
+  def new
+  end
+
+  def create
+    @project.import_url = params[:project][:import_url]
+
+    if @project.save
+      @project.reload
+
+      if @project.import_failed?
+        @project.import_retry
+      else
+        @project.import_start
+      end
+    end
+
+    redirect_to project_import_path(@project)
+  end
+
+  def show
+    unless @project.import_in_progress?
+      if @project.import_finished?
+        redirect_to(@project) and return
+      else
+        redirect_to new_project_import_path(@project) and return
+      end
+    end
+  end
+
+  private
+
+  def require_no_repo
+    if @project.repository_exists?
+      redirect_to(@project) and return
+    end
+  end
+
+  def redirect_if_progress
+    if @project.import_in_progress?
+      redirect_to project_import_path(@project) and return
+    end
+  end
+end
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index bcd14a1c847..3a90c1c806d 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -1,7 +1,14 @@
 class Projects::RepositoriesController < Projects::ApplicationController
   # Authorize
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
+  before_filter :require_non_empty_project, except: :create
+  before_filter :authorize_admin_project!, only: :create
+
+  def create
+    @project.create_repository
+
+    redirect_to @project
+  end
 
   def archive
     unless can?(current_user, :download_code, @project)
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 1a80d13a3990937580c97e2b0ba8fb98f69bc055 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Tue, 25 Nov 2014 18:15:30 +0200
Subject: Multi-provider auth. LDAP is not reworked

---
 app/controllers/omniauth_callbacks_controller.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index bd4b310fcbf..58d0506c07d 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -42,10 +42,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def handle_omniauth
     if current_user
-      # Change a logged-in user's authentication method:
-      current_user.extern_uid = oauth['uid']
-      current_user.provider = oauth['provider']
-      current_user.save
+      # Add new authentication method
+      current_user.identities.find_or_create_by(extern_uid: oauth['uid'], provider: oauth['provider'])
       redirect_to profile_path
     else
       @user = Gitlab::OAuth::User.new(oauth)
@@ -53,6 +51,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       # Only allow properly saved users to login.
       if @user.persisted? && @user.valid?
+        # binding.pry
         sign_in_and_redirect(@user.gl_user)
       else
         error_message =
-- 
cgit v1.2.1


From 3a5ed5260b24051939575d1934ce9b8392cac09f Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 27 Nov 2014 13:34:39 +0200
Subject: Supporting for multiple omniauth provider for the same user

---
 app/controllers/omniauth_callbacks_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 58d0506c07d..3e984e5007a 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -51,7 +51,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       # Only allow properly saved users to login.
       if @user.persisted? && @user.valid?
-        # binding.pry
         sign_in_and_redirect(@user.gl_user)
       else
         error_message =
@@ -66,8 +65,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
       end
     end
-  rescue StandardError
-    flash[:notice] = "There's no such user!"
+  rescue ForbiddenAction => e
+    flash[:notice] = e.message
     redirect_to new_user_session_path
   end
 
-- 
cgit v1.2.1


From db2edff937cbc309c10bb1a987356a58f8a9c8fa Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 4 Dec 2014 15:07:01 +0200
Subject: Handle web hook exception

Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects/hooks_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index cab8fd76e6c..2d6c3111192 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -26,6 +26,7 @@ class Projects::HooksController < Projects::ApplicationController
   def test
     if !@project.empty_repo?
       status = TestHookService.new.execute(hook, current_user)
+
       if status
         flash[:notice] = 'Hook successfully executed.'
       else
-- 
cgit v1.2.1


From a46fe875c6aea206e575e2b083bd31ed36ee1b1e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 4 Dec 2014 21:49:19 +0200
Subject: Feature: atom feed for user activity

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

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0b442f5383a..67af1801bda 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,9 +20,14 @@ class UsersController < ApplicationController
 
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
-      where(project_id: authorized_projects_ids).limit(20)
+      where(project_id: authorized_projects_ids).limit(30)
 
     @title = @user.name
+
+    respond_to do |format|
+      format.html
+      format.atom { render layout: false }
+    end
   end
 
   def determine_layout
-- 
cgit v1.2.1


From 6487419364fa9c179e24028d85b2be10d574067f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 5 Dec 2014 16:02:08 +0200
Subject: Automatically close merge requests that were locker for 1 day

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects/merge_requests_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 20a733b10e1..bd43d15984d 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -225,6 +225,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @allowed_to_merge = allowed_to_merge?
     @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
     @source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
+
+    if @merge_request.locked_long_ago?
+      @merge_request.unlock_mr
+      @merge_request.close
+    end
   end
 
   def allowed_to_merge?
-- 
cgit v1.2.1


From e0f30c605bbf0a92f3ddeffdd80d765a5f041a06 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 5 Dec 2014 17:13:07 +0200
Subject: Add author filter for issues & merge requests pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects/application_controller.rb | 27 ++++++++++++++++++++++
 app/controllers/projects/issues_controller.rb      | 16 ++-----------
 .../projects/merge_requests_controller.rb          | 10 +-------
 3 files changed, 30 insertions(+), 23 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 7e4580017dd..6b7fe06d59f 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -29,4 +29,31 @@ class Projects::ApplicationController < ApplicationController
       redirect_to project_tree_path(@project, @ref), notice: "This action is not allowed unless you are on top of a branch"
     end
   end
+
+  def set_filter_variables(collection)
+    params[:sort] ||= 'newest'
+    params[:scope] = 'all' if params[:scope].blank?
+    params[:state] = 'opened' if params[:state].blank?
+
+    @sort = params[:sort].humanize
+
+    assignee_id = params[:assignee_id]
+    author_id = params[:author_id]
+    milestone_id = params[:milestone_id]
+
+    if assignee_id.present? && !assignee_id.to_i.zero?
+      @assignee = @project.team.find(assignee_id)
+    end
+
+    if author_id.present? && !author_id.to_i.zero?
+      @author = @project.team.find(assignee_id)
+    end
+
+    if milestone_id.present? && !milestone_id.to_i.zero?
+      @milestone = @project.milestones.find(milestone_id)
+    end
+
+    @assignees = User.where(id: collection.pluck(:assignee_id))
+    @authors = User.where(id: collection.pluck(:author_id))
+  end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index c6d526f05c5..22235123826 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -18,18 +18,12 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def index
     terms = params['issue_search']
+    set_filter_variables(@project.issues)
 
-    @issues = issues_filtered
+    @issues = IssuesFinder.new.execute(current_user, params.merge(project_id: @project.id))
     @issues = @issues.full_search(terms) if terms.present?
     @issues = @issues.page(params[:page]).per(20)
 
-    assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
-    @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
-    @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
-    sort_param = params[:sort] || 'newest'
-    @sort = sort_param.humanize unless sort_param.empty?
-    @assignees = User.where(id: @project.issues.pluck(:assignee_id)).active
-
     respond_to do |format|
       format.html
       format.atom { render layout: false }
@@ -127,12 +121,6 @@ class Projects::IssuesController < Projects::ApplicationController
     return render_404 unless @project.issues_enabled
   end
 
-  def issues_filtered
-    params[:scope] = 'all' if params[:scope].blank?
-    params[:state] = 'opened' if params[:state].blank?
-    @issues = IssuesFinder.new.execute(current_user, params.merge(project_id: @project.id))
-  end
-
   # Since iids are implemented only in 6.1
   # user may navigate to issue page using old global ids.
   #
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index bd43d15984d..4d6f41e9de5 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -17,18 +17,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
 
   def index
-    params[:sort] ||= 'newest'
-    params[:scope] = 'all' if params[:scope].blank?
-    params[:state] = 'opened' if params[:state].blank?
+    set_filter_variables(@project.merge_requests)
 
     @merge_requests = MergeRequestsFinder.new.execute(current_user, params.merge(project_id: @project.id))
     @merge_requests = @merge_requests.page(params[:page]).per(20)
-
-    @sort = params[:sort].humanize
-    assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
-    @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
-    @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
-    @assignees = User.where(id: @project.merge_requests.pluck(:assignee_id))
   end
 
   def show
-- 
cgit v1.2.1


From 118bd7178b2be5f8a8fbcfa6af66e9e6d299b658 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 12 Dec 2014 13:28:48 +0200
Subject: Sanitize snippet file name in raw headers

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects/snippets_controller.rb | 2 +-
 app/controllers/snippets_controller.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 9d5dd8a95cc..25c887deafa 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -68,7 +68,7 @@ class Projects::SnippetsController < Projects::ApplicationController
       @snippet.content,
       type: 'text/plain; charset=utf-8',
       disposition: 'inline',
-      filename: @snippet.file_name
+      filename: @snippet.sanitized_file_name
     )
   end
 
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index bf3312fedc8..312e561b522 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -79,7 +79,7 @@ class SnippetsController < ApplicationController
       @snippet.content,
       type: 'text/plain; charset=utf-8',
       disposition: 'inline',
-      filename: @snippet.file_name
+      filename: @snippet.sanitized_file_name
     )
   end
 
-- 
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')

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 ed2bcf952be8e6431ad5d3fb7b39927880b512b0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 22 Dec 2014 13:50:58 +0200
Subject: Set group path during creation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/groups_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 36222758eb2..1ea2a2a8c18 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -23,7 +23,7 @@ class GroupsController < ApplicationController
 
   def create
     @group = Group.new(group_params)
-    @group.path = @group.name.dup.parameterize if @group.name
+    @group.name = @group.path.dup unless @group.name
 
     if @group.save
       @group.add_owner(current_user)
-- 
cgit v1.2.1


From 52a8e5c01a2a5377dbd51587f8197c49b17430b3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 22 Dec 2014 13:55:32 +0200
Subject: Set group name from path in admin controller

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/admin/groups_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index e6d0c9323c1..8c7d90a5d9f 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -21,7 +21,7 @@ class Admin::GroupsController < Admin::ApplicationController
 
   def create
     @group = Group.new(group_params)
-    @group.path = @group.name.dup.parameterize if @group.name
+    @group.name = @group.path.dup unless @group.name
 
     if @group.save
       @group.add_owner(current_user)
-- 
cgit v1.2.1


From 47634e392fab457dd0634225961944804bc04efe Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 23 Dec 2014 18:49:39 +0200
Subject: Refactor issues and merge requests lists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/application_controller.rb          | 42 ++++++++++++++++++++++
 app/controllers/dashboard_controller.rb            | 12 +++----
 app/controllers/groups_controller.rb               | 18 +++-------
 app/controllers/projects/application_controller.rb | 27 --------------
 app/controllers/projects/issues_controller.rb      |  6 ++--
 .../projects/merge_requests_controller.rb          |  6 ++--
 6 files changed, 56 insertions(+), 55 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f1e1bebe5ce..0ddd743f053 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -239,4 +239,46 @@ class ApplicationController < ActionController::Base
       redirect_to profile_path, notice: 'Please complete your profile with email address' and return
     end
   end
+
+  def set_filters_defaults
+    params[:sort] ||= 'newest'
+    params[:scope] = 'all' if params[:scope].blank?
+    params[:state] = 'opened' if params[:state].blank?
+
+    @sort = params[:sort].humanize
+
+    if @project
+      params[:project_id] = @project.id
+    elsif @group
+      params[:group_id] = @group.id
+    else
+      params[:authorized_only] = true
+
+      unless params[:assignee_id].present?
+        params[:assignee_id] = current_user.id
+      end
+    end
+  end
+
+  def set_filter_values(collection)
+    assignee_id = params[:assignee_id]
+    author_id = params[:author_id]
+    milestone_id = params[:milestone_id]
+
+    @assignees = User.where(id: collection.pluck(:assignee_id))
+    @authors = User.where(id: collection.pluck(:author_id))
+    @milestones = Milestone.where(id: collection.pluck(:milestone_id))
+
+    if assignee_id.present? && !assignee_id.to_i.zero?
+      @assignee = @assignees.find(assignee_id)
+    end
+
+    if author_id.present? && !author_id.to_i.zero?
+      @author = @authors.find(author_id)
+    end
+
+    if milestone_id.present? && !milestone_id.to_i.zero?
+      @milestone = @milestones.find(milestone_id)
+    end
+  end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 5aff526d1b5..bfd1361f2df 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -3,8 +3,6 @@ class DashboardController < ApplicationController
 
   before_filter :load_projects, except: [:projects]
   before_filter :event_filter, only: :show
-  before_filter :default_filter, only: [:issues, :merge_requests]
-
 
   def show
     # Fetch only 30 projects.
@@ -55,13 +53,17 @@ class DashboardController < ApplicationController
   end
 
   def merge_requests
+    set_filters_defaults
     @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
+    set_filter_values(@merge_requests)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
     @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
+    set_filters_defaults
     @issues = IssuesFinder.new.execute(current_user, params)
+    set_filter_values(@issues)
     @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.preload(:author, :project)
 
@@ -76,10 +78,4 @@ class DashboardController < ApplicationController
   def load_projects
     @projects = current_user.authorized_projects.sorted_by_activity.non_archived
   end
-
-  def default_filter
-    params[:scope] = 'assigned-to-me' if params[:scope].blank?
-    params[:state] = 'opened' if params[:state].blank?
-    params[:authorized_only] = true
-  end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 36222758eb2..a28f4cc4072 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -11,8 +11,6 @@ class GroupsController < ApplicationController
   # Load group projects
   before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
 
-  before_filter :default_filter, only: [:issues, :merge_requests]
-
   layout :determine_layout
 
   before_filter :set_title, only: [:new, :create]
@@ -47,13 +45,17 @@ class GroupsController < ApplicationController
   end
 
   def merge_requests
+    set_filters_defaults
     @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
+    set_filter_values(@merge_requests)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
     @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
+    set_filters_defaults
     @issues = IssuesFinder.new.execute(current_user, params)
+    set_filter_values(@issues)
     @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.preload(:author, :project)
 
@@ -148,18 +150,6 @@ class GroupsController < ApplicationController
     end
   end
 
-  def default_filter
-    if params[:scope].blank?
-      if current_user
-        params[:scope] = 'assigned-to-me'
-      else
-        params[:scope] = 'all'
-      end
-    end
-    params[:state] = 'opened' if params[:state].blank?
-    params[:group_id] = @group.id
-  end
-
   def group_params
     params.require(:group).permit(:name, :description, :path, :avatar)
   end
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 6b7fe06d59f..7e4580017dd 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -29,31 +29,4 @@ class Projects::ApplicationController < ApplicationController
       redirect_to project_tree_path(@project, @ref), notice: "This action is not allowed unless you are on top of a branch"
     end
   end
-
-  def set_filter_variables(collection)
-    params[:sort] ||= 'newest'
-    params[:scope] = 'all' if params[:scope].blank?
-    params[:state] = 'opened' if params[:state].blank?
-
-    @sort = params[:sort].humanize
-
-    assignee_id = params[:assignee_id]
-    author_id = params[:author_id]
-    milestone_id = params[:milestone_id]
-
-    if assignee_id.present? && !assignee_id.to_i.zero?
-      @assignee = @project.team.find(assignee_id)
-    end
-
-    if author_id.present? && !author_id.to_i.zero?
-      @author = @project.team.find(assignee_id)
-    end
-
-    if milestone_id.present? && !milestone_id.to_i.zero?
-      @milestone = @project.milestones.find(milestone_id)
-    end
-
-    @assignees = User.where(id: collection.pluck(:assignee_id))
-    @authors = User.where(id: collection.pluck(:author_id))
-  end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 22235123826..0266c51babb 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -18,9 +18,9 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def index
     terms = params['issue_search']
-    set_filter_variables(@project.issues)
-
-    @issues = IssuesFinder.new.execute(current_user, params.merge(project_id: @project.id))
+    set_filters_defaults
+    @issues = IssuesFinder.new.execute(current_user, params)
+    set_filter_values(@issues)
     @issues = @issues.full_search(terms) if terms.present?
     @issues = @issues.page(params[:page]).per(20)
 
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 4d6f41e9de5..20d1222326e 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -17,9 +17,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
 
   def index
-    set_filter_variables(@project.merge_requests)
-
-    @merge_requests = MergeRequestsFinder.new.execute(current_user, params.merge(project_id: @project.id))
+    set_filters_defaults
+    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
+    set_filter_values(@merge_requests)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
   end
 
-- 
cgit v1.2.1


From 1fa19401e969f79cbd737c55e63249ca9355791c Mon Sep 17 00:00:00 2001
From: Jason Lippert <jason@glasspelican.ca>
Date: Mon, 8 Dec 2014 16:54:09 -0500
Subject: Teamcity interaction using 8.1 rest api

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index c50a1f1e75b..ef4d2609147 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -42,7 +42,7 @@ class Projects::ServicesController < Projects::ApplicationController
       :title, :token, :type, :active, :api_key, :subdomain,
       :room, :recipients, :project_url, :webhook,
       :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
-      :build_key, :server
+      :build_key, :server, :teamcity_url, :build_type
     )
   end
 end
-- 
cgit v1.2.1


From 016981c009a2a8c6066085300a838d9c9d6bfd5d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 24 Dec 2014 11:04:33 +0200
Subject: Refactor issuable list pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/application_controller.rb          | 37 ++++++++++++++++------
 app/controllers/dashboard_controller.rb            |  8 ++---
 app/controllers/groups_controller.rb               |  8 ++---
 app/controllers/projects/issues_controller.rb      |  4 +--
 .../projects/merge_requests_controller.rb          |  4 +--
 5 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0ddd743f053..79824116b41 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -240,24 +240,26 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def set_filters_defaults
+  def set_filters_params
     params[:sort] ||= 'newest'
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
 
-    @sort = params[:sort].humanize
+    @filter_params = params.dup
 
     if @project
-      params[:project_id] = @project.id
+      @filter_params[:project_id] = @project.id
     elsif @group
-      params[:group_id] = @group.id
+      @filter_params[:group_id] = @group.id
     else
-      params[:authorized_only] = true
+      @filter_params[:authorized_only] = true
 
-      unless params[:assignee_id].present?
-        params[:assignee_id] = current_user.id
+      unless @filter_params[:assignee_id]
+        @filter_params[:assignee_id] = current_user.id
       end
     end
+
+    @filter_params
   end
 
   def set_filter_values(collection)
@@ -265,20 +267,35 @@ class ApplicationController < ActionController::Base
     author_id = params[:author_id]
     milestone_id = params[:milestone_id]
 
+    @sort = params[:sort].try(:humanize)
     @assignees = User.where(id: collection.pluck(:assignee_id))
     @authors = User.where(id: collection.pluck(:author_id))
     @milestones = Milestone.where(id: collection.pluck(:milestone_id))
 
     if assignee_id.present? && !assignee_id.to_i.zero?
-      @assignee = @assignees.find(assignee_id)
+      @assignee = @assignees.find_by(id: assignee_id)
     end
 
     if author_id.present? && !author_id.to_i.zero?
-      @author = @authors.find(author_id)
+      @author = @authors.find_by(id: author_id)
     end
 
     if milestone_id.present? && !milestone_id.to_i.zero?
-      @milestone = @milestones.find(milestone_id)
+      @milestone = @milestones.find_by(id: milestone_id)
     end
   end
+
+  def get_issues_collection
+    set_filters_params
+    issues = IssuesFinder.new.execute(current_user, @filter_params)
+    set_filter_values(issues)
+    issues
+  end
+
+  def get_merge_requests_collection
+    set_filters_params
+    merge_requests = MergeRequestsFinder.new.execute(current_user, @filter_params)
+    set_filter_values(merge_requests)
+    merge_requests
+  end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index bfd1361f2df..cd876024ba3 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -53,17 +53,13 @@ class DashboardController < ApplicationController
   end
 
   def merge_requests
-    set_filters_defaults
-    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
-    set_filter_values(@merge_requests)
+    @merge_requests = get_merge_requests_collection
     @merge_requests = @merge_requests.page(params[:page]).per(20)
     @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
-    set_filters_defaults
-    @issues = IssuesFinder.new.execute(current_user, params)
-    set_filter_values(@issues)
+    @issues = get_issues_collection
     @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.preload(:author, :project)
 
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index a28f4cc4072..6cd12c35bf9 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -45,17 +45,13 @@ class GroupsController < ApplicationController
   end
 
   def merge_requests
-    set_filters_defaults
-    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
-    set_filter_values(@merge_requests)
+    @merge_requests = get_merge_requests_collection
     @merge_requests = @merge_requests.page(params[:page]).per(20)
     @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
-    set_filters_defaults
-    @issues = IssuesFinder.new.execute(current_user, params)
-    set_filter_values(@issues)
+    @issues = get_issues_collection
     @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.preload(:author, :project)
 
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 0266c51babb..42e207cf376 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -18,9 +18,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def index
     terms = params['issue_search']
-    set_filters_defaults
-    @issues = IssuesFinder.new.execute(current_user, params)
-    set_filter_values(@issues)
+    @issues = get_issues_collection
     @issues = @issues.full_search(terms) if terms.present?
     @issues = @issues.page(params[:page]).per(20)
 
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 20d1222326e..d23461821d7 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -17,9 +17,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
 
   def index
-    set_filters_defaults
-    @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
-    set_filter_values(@merge_requests)
+    @merge_requests = get_merge_requests_collection
     @merge_requests = @merge_requests.page(params[:page]).per(20)
   end
 
-- 
cgit v1.2.1


From 7b792af872699cd9439c750b780b0b906342cff0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 24 Dec 2014 11:39:03 +0200
Subject: Improvements to issues/mr filters:

* use filter_params variable when set filter values
* fix project issues spinach tests

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

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 79824116b41..1b48572f2b8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -263,11 +263,11 @@ class ApplicationController < ActionController::Base
   end
 
   def set_filter_values(collection)
-    assignee_id = params[:assignee_id]
-    author_id = params[:author_id]
-    milestone_id = params[:milestone_id]
+    assignee_id = @filter_params[:assignee_id]
+    author_id = @filter_params[:author_id]
+    milestone_id = @filter_params[:milestone_id]
 
-    @sort = params[:sort].try(:humanize)
+    @sort = @filter_params[:sort].try(:humanize)
     @assignees = User.where(id: collection.pluck(:assignee_id))
     @authors = User.where(id: collection.pluck(:author_id))
     @milestones = Milestone.where(id: collection.pluck(:milestone_id))
-- 
cgit v1.2.1


From 97d7c06f781f17a21689cf35410009f1247427e9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 24 Dec 2014 12:56:03 +0200
Subject: Fix scroll problems and disable authorized_only filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/application_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1b48572f2b8..41ad5f98ace 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -252,7 +252,11 @@ class ApplicationController < ActionController::Base
     elsif @group
       @filter_params[:group_id] = @group.id
     else
-      @filter_params[:authorized_only] = true
+      # TODO: this filter ignore issues/mr created in public or
+      # internal repos where you are not a member. Enable this filter
+      # or improve current implementation to filter only issues you
+      # created or assigned or mentioned
+      #@filter_params[:authorized_only] = true
 
       unless @filter_params[:assignee_id]
         @filter_params[:assignee_id] = current_user.id
-- 
cgit v1.2.1


From e41dadcb33fda44ee274daa673bd933e13aa90eb Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 19 Dec 2014 16:15:29 +0200
Subject: Doorkeeper integration

---
 app/controllers/oauth/applications_controller.rb   | 25 ++++++++++
 app/controllers/oauth/authorizations_controller.rb | 57 ++++++++++++++++++++++
 .../oauth/authorized_applications_controller.rb    |  8 +++
 app/controllers/profiles/accounts_controller.rb    |  2 +
 4 files changed, 92 insertions(+)
 create mode 100644 app/controllers/oauth/applications_controller.rb
 create mode 100644 app/controllers/oauth/authorizations_controller.rb
 create mode 100644 app/controllers/oauth/authorized_applications_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
new file mode 100644
index 00000000000..8eafe5e3b3d
--- /dev/null
+++ b/app/controllers/oauth/applications_controller.rb
@@ -0,0 +1,25 @@
+class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
+  before_filter :authenticate_user!
+  layout "profile"
+
+  def index
+    @applications = current_user.oauth_applications
+  end
+
+  def create
+    @application = Doorkeeper::Application.new(application_params)
+    @application.owner = current_user if Doorkeeper.configuration.confirm_application_owner?
+    if @application.save
+      flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
+      redirect_to oauth_application_url(@application)
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy]) if @application.destroy
+    redirect_to profile_account_url
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
new file mode 100644
index 00000000000..c46707e2c77
--- /dev/null
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -0,0 +1,57 @@
+class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
+  before_filter :authenticate_resource_owner!
+  layout "profile"
+
+  def new
+    if pre_auth.authorizable?
+      if skip_authorization? || matching_token?
+        auth = authorization.authorize
+        redirect_to auth.redirect_uri
+      else
+        render "doorkeeper/authorizations/new"
+      end
+    else
+      render "doorkeeper/authorizations/error"
+    end
+  end
+
+  # TODO: Handle raise invalid authorization
+  def create
+    redirect_or_render authorization.authorize
+  end
+
+  def destroy
+    redirect_or_render authorization.deny
+  end
+
+  private
+
+  def matching_token?
+    Doorkeeper::AccessToken.matching_token_for pre_auth.client,
+                                   current_resource_owner.id,
+                                   pre_auth.scopes
+  end
+
+  def redirect_or_render(auth)
+    if auth.redirectable?
+      redirect_to auth.redirect_uri
+    else
+      render json: auth.body, status: auth.status
+    end
+  end
+
+  def pre_auth
+    @pre_auth ||= Doorkeeper::OAuth::PreAuthorization.new(Doorkeeper.configuration,
+                                              server.client_via_uid,
+                                              params)
+  end
+
+  def authorization
+    @authorization ||= strategy.request
+  end
+
+  def strategy
+    @strategy ||= server.authorization_request pre_auth.response_type
+  end
+end
+
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
new file mode 100644
index 00000000000..b6d4a99c0a9
--- /dev/null
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -0,0 +1,8 @@
+class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
+  layout "profile"
+
+  def destroy
+    Doorkeeper::AccessToken.revoke_all_for params[:id], current_resource_owner
+    redirect_to profile_account_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb
index fe121691a10..5f15378c831 100644
--- a/app/controllers/profiles/accounts_controller.rb
+++ b/app/controllers/profiles/accounts_controller.rb
@@ -3,5 +3,7 @@ class Profiles::AccountsController < ApplicationController
 
   def show
     @user = current_user
+    @applications = current_user.oauth_applications
+    @authorized_applications = Doorkeeper::Application.authorized_for(current_user)
   end
 end
-- 
cgit v1.2.1


From 7fe8d41d88f744b16e6e12c1c07ef3f956994110 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 25 Dec 2014 16:46:28 +0200
Subject: Improve code style

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/oauth/applications_controller.rb           | 14 ++++++++++----
 app/controllers/oauth/authorizations_controller.rb         | 11 ++++++-----
 .../oauth/authorized_applications_controller.rb            |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index 8eafe5e3b3d..b53e9662af0 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -8,7 +8,11 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
 
   def create
     @application = Doorkeeper::Application.new(application_params)
-    @application.owner = current_user if Doorkeeper.configuration.confirm_application_owner?
+
+    if Doorkeeper.configuration.confirm_application_owner?
+      @application.owner = current_user
+    end
+
     if @application.save
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
       redirect_to oauth_application_url(@application)
@@ -18,8 +22,10 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   end
 
   def destroy
-    flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy]) if @application.destroy
+    if @application.destroy
+      flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy])
+    end
+
     redirect_to profile_account_url
   end
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index c46707e2c77..72cbbf2e616 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -27,9 +27,9 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   private
 
   def matching_token?
-    Doorkeeper::AccessToken.matching_token_for pre_auth.client,
-                                   current_resource_owner.id,
-                                   pre_auth.scopes
+    Doorkeeper::AccessToken.matching_token_for(pre_auth.client,
+                                               current_resource_owner.id,
+                                               pre_auth.scopes)
   end
 
   def redirect_or_render(auth)
@@ -41,7 +41,8 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   end
 
   def pre_auth
-    @pre_auth ||= Doorkeeper::OAuth::PreAuthorization.new(Doorkeeper.configuration,
+    @pre_auth ||=
+      Doorkeeper::OAuth::PreAuthorization.new(Doorkeeper.configuration,
                                               server.client_via_uid,
                                               params)
   end
@@ -51,7 +52,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   end
 
   def strategy
-    @strategy ||= server.authorization_request pre_auth.response_type
+    @strategy ||= server.authorization_request(pre_auth.response_type)
   end
 end
 
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index b6d4a99c0a9..202421b4abd 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -2,7 +2,7 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
   layout "profile"
 
   def destroy
-    Doorkeeper::AccessToken.revoke_all_for params[:id], current_resource_owner
+    Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner)
     redirect_to profile_account_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From 592e396869ba5dc116cec333733cea8dfbf4a9b5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 25 Dec 2014 18:35:04 +0200
Subject: Rework oauth2 feature

* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/oauth/applications_controller.rb            | 12 +++++++++++-
 app/controllers/oauth/authorizations_controller.rb          |  1 -
 app/controllers/oauth/authorized_applications_controller.rb |  2 +-
 app/controllers/profiles/accounts_controller.rb             |  2 --
 app/controllers/profiles_controller.rb                      |  5 +++++
 5 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index b53e9662af0..93201eff303 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -3,7 +3,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   layout "profile"
 
   def index
-    @applications = current_user.oauth_applications
+    head :forbidden and return
   end
 
   def create
@@ -28,4 +28,14 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
 
     redirect_to profile_account_url
   end
+
+  private
+
+  def set_application
+    @application = current_user.oauth_applications.find(params[:id])
+  end
+
+  rescue_from ActiveRecord::RecordNotFound do |exception|
+    render "errors/not_found", layout: "errors", status: 404
+  end
 end
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 72cbbf2e616..a57b4a60c24 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -55,4 +55,3 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
     @strategy ||= server.authorization_request(pre_auth.response_type)
   end
 end
-
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 202421b4abd..0b27ce7da72 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -3,6 +3,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
 
   def destroy
     Doorkeeper::AccessToken.revoke_all_for(params[:id], current_resource_owner)
-    redirect_to profile_account_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
+    redirect_to applications_profile_url, notice: I18n.t(:notice, scope: [:doorkeeper, :flash, :authorized_applications, :destroy])
   end
 end
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb
index 5f15378c831..fe121691a10 100644
--- a/app/controllers/profiles/accounts_controller.rb
+++ b/app/controllers/profiles/accounts_controller.rb
@@ -3,7 +3,5 @@ class Profiles::AccountsController < ApplicationController
 
   def show
     @user = current_user
-    @applications = current_user.oauth_applications
-    @authorized_applications = Doorkeeper::Application.authorized_for(current_user)
   end
 end
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index e877f9b9049..c0b7e2223a2 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -13,6 +13,11 @@ class ProfilesController < ApplicationController
   def design
   end
 
+  def applications
+    @applications = current_user.oauth_applications
+    @authorized_tokens = current_user.oauth_authorized_tokens
+  end
+
   def update
     user_params.except!(:email) if @user.ldap_user?
 
-- 
cgit v1.2.1


From aadfb3665f39e5886254bac856ebd1cc47f8c652 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 25 Dec 2014 18:46:19 +0200
Subject: Fix tests and add message if no oauth apps

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/oauth/applications_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index 93201eff303..3407490e498 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -26,7 +26,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :destroy])
     end
 
-    redirect_to profile_account_url
+    redirect_to applications_profile_url
   end
 
   private
-- 
cgit v1.2.1


From b7eb0d178e2a1e951ba6e110ad703def3fb35357 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 26 Dec 2014 09:14:53 +0100
Subject: Add checkbox for protected branch developer can push to.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index bd31b1d3c54..a0df392e424 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -27,6 +27,6 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
   private
 
   def protected_branch_params
-    params.require(:protected_branch).permit(:name)
+    params.require(:protected_branch).permit(:name, :developers_can_push)
   end
 end
-- 
cgit v1.2.1


From 92eb3974ac28aff7c78f4ca0cbafbad842fc7160 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 26 Dec 2014 11:39:12 +0100
Subject: Add option to disable/enable developers push to already protected
 branches.

---
 .../projects/protected_branches_controller.rb           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index a0df392e424..ac68992faa0 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -15,6 +15,23 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
     redirect_to project_protected_branches_path(@project)
   end
 
+  def update
+    protected_branch = @project.protected_branches.find(params[:id])
+
+    if protected_branch &&
+       protected_branch.update_attributes(
+        developers_can_push: params[:developers_can_push]
+       )
+      flash[:notice] = 'Branch was successfully updated.'
+    else
+      flash[:alert] = 'Could not update the branch.'
+    end
+
+    respond_to do |format|
+      format.html { redirect_to project_protected_branches_path }
+    end
+  end
+
   def destroy
     @project.protected_branches.find(params[:id]).destroy
 
-- 
cgit v1.2.1


From 16ebeedef225db60e1f62d43e5152a04c29fd289 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 26 Dec 2014 15:37:04 +0100
Subject: Update branch status with ajax call.

---
 app/controllers/projects/protected_branches_controller.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index ac68992faa0..02160d973b3 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -22,13 +22,14 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
        protected_branch.update_attributes(
         developers_can_push: params[:developers_can_push]
        )
-      flash[:notice] = 'Branch was successfully updated.'
-    else
-      flash[:alert] = 'Could not update the branch.'
-    end
 
-    respond_to do |format|
-      format.html { redirect_to project_protected_branches_path }
+      respond_to do |format|
+        format.json { render :json => protected_branch, status: :ok }
+      end
+    else
+      respond_to do |format|
+        format.json { render json: protected_branch.errors, status: :unprocessable_entity }
+      end
     end
   end
 
-- 
cgit v1.2.1


From 465f186954d00fa47c8b05cc91f33e7943aa209a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 26 Dec 2014 18:33:53 +0200
Subject: Show assigned issues/mr be default on dashboard

This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

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

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 41ad5f98ace..4b8cae469e3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -257,10 +257,6 @@ class ApplicationController < ActionController::Base
       # or improve current implementation to filter only issues you
       # created or assigned or mentioned
       #@filter_params[:authorized_only] = true
-
-      unless @filter_params[:assignee_id]
-        @filter_params[:assignee_id] = current_user.id
-      end
     end
 
     @filter_params
-- 
cgit v1.2.1


From 6c65b91d8c754c61fe8e50966283af5f78c1c9f0 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Tue, 30 Sep 2014 22:28:05 +0200
Subject: Remove or prepend _ to unused method arguments

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

(limited to 'app/controllers')

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 6d3214b70a8..9321536e6df 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -15,11 +15,11 @@ class RegistrationsController < Devise::RegistrationsController
     super
   end
 
-  def after_sign_up_path_for(resource)
+  def after_sign_up_path_for(_resource)
     new_user_session_path
   end
 
-  def after_inactive_sign_up_path_for(resource)
+  def after_inactive_sign_up_path_for(_resource)
     new_user_session_path
   end
 
-- 
cgit v1.2.1


From 492f3a477940daf425aabc9dd4a33e7a1e9092c1 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 29 Dec 2014 17:07:23 +0100
Subject: Add user key actions to admins.

---
 app/controllers/admin/users_controller.rb | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index baad9095b70..b11a0b04687 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -11,6 +11,7 @@ class Admin::UsersController < Admin::ApplicationController
   def show
     @personal_projects = user.personal_projects
     @joined_projects = user.projects.joined(@user)
+    @ssh_keys = user.keys.order('id DESC')
   end
 
   def new
@@ -107,6 +108,27 @@ class Admin::UsersController < Admin::ApplicationController
     end
   end
 
+  def show_key
+    @key = user.keys.find(params[:key_id])
+
+    respond_to do |format|
+      format.html { render 'key' }
+      format.js { render nothing: true }
+    end
+  end
+
+  def remove_key
+    key = user.keys.find(params[:key_id])
+
+    respond_to do |format|
+      if key.destroy
+        format.html { redirect_to [:admin, user], notice: 'User key was successfully removed.' }
+      else
+        format.html { redirect_to [:admin, user], alert: 'Failed to remove user key.' }
+      end
+    end
+  end
+
   protected
 
   def user
@@ -118,7 +140,7 @@ class Admin::UsersController < Admin::ApplicationController
       :email, :remember_me, :bio, :name, :username,
       :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, :force_random_password,
       :extern_uid, :provider, :password_expires_at, :avatar, :hide_no_ssh_key,
-      :projects_limit, :can_create_group, :admin
+      :projects_limit, :can_create_group, :admin, :key_id
     )
   end
 end
-- 
cgit v1.2.1


From 82829ed49e11a173275633cad63978e4ee07e927 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Tue, 30 Dec 2014 10:15:11 +0100
Subject: Move user key manipulation in admin section to a separate controller.

---
 app/controllers/admin/keys_controller.rb  | 34 +++++++++++++++++++++++++++++++
 app/controllers/admin/users_controller.rb | 21 -------------------
 2 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 app/controllers/admin/keys_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb
new file mode 100644
index 00000000000..21111bb44f5
--- /dev/null
+++ b/app/controllers/admin/keys_controller.rb
@@ -0,0 +1,34 @@
+class Admin::KeysController < Admin::ApplicationController
+  before_filter :user, only: [:show, :destroy]
+
+  def show
+    @key = user.keys.find(params[:id])
+
+    respond_to do |format|
+      format.html
+      format.js { render nothing: true }
+    end
+  end
+
+  def destroy
+    key = user.keys.find(params[:id])
+
+    respond_to do |format|
+      if key.destroy
+        format.html { redirect_to [:admin, user], notice: 'User key was successfully removed.' }
+      else
+        format.html { redirect_to [:admin, user], alert: 'Failed to remove user key.' }
+      end
+    end
+  end
+
+  protected
+
+  def user
+    @user ||= User.find_by!(username: params[:user_id])
+  end
+
+  def key_params
+    params.require(:user_id, :id)
+  end
+end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b11a0b04687..86c671ed756 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -108,27 +108,6 @@ class Admin::UsersController < Admin::ApplicationController
     end
   end
 
-  def show_key
-    @key = user.keys.find(params[:key_id])
-
-    respond_to do |format|
-      format.html { render 'key' }
-      format.js { render nothing: true }
-    end
-  end
-
-  def remove_key
-    key = user.keys.find(params[:key_id])
-
-    respond_to do |format|
-      if key.destroy
-        format.html { redirect_to [:admin, user], notice: 'User key was successfully removed.' }
-      else
-        format.html { redirect_to [:admin, user], alert: 'Failed to remove user key.' }
-      end
-    end
-  end
-
   protected
 
   def user
-- 
cgit v1.2.1


From 607ea7c6e5663542ae53de66a80f3e8beefe1341 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Tue, 30 Dec 2014 11:01:30 +0100
Subject: Share the key table between admin and profile resources.

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

(limited to 'app/controllers')

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 86c671ed756..aea8545d38e 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -11,7 +11,7 @@ class Admin::UsersController < Admin::ApplicationController
   def show
     @personal_projects = user.personal_projects
     @joined_projects = user.projects.joined(@user)
-    @ssh_keys = user.keys.order('id DESC')
+    @keys = user.keys.order('id DESC')
   end
 
   def new
-- 
cgit v1.2.1


From 33c9f05c6bb90a995ddc685b4a22479f17c575e5 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 9 Oct 2014 09:47:47 +0200
Subject: Append in place for strings and arrays

---
 app/controllers/projects/refs_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index 5d9336bdc49..67665f5f601 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -41,9 +41,9 @@ class Projects::RefsController < Projects::ApplicationController
     @path = params[:path]
 
     contents = []
-    contents += tree.trees
-    contents += tree.blobs
-    contents += tree.submodules
+    contents.push(*tree.trees)
+    contents.push(*tree.blobs)
+    contents.push(*tree.submodules)
 
     @logs = contents[@offset, @limit].to_a.map do |content|
       file = @path ? File.join(@path, content.name) : content.name
-- 
cgit v1.2.1


From 4165426725677d092275f2935a43527f130d8bcb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 6 Jan 2015 12:32:04 -0800
Subject: Restyle and refactor milestones filter

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index f362f449e70..95801f8b8fb 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -11,7 +11,7 @@ class Projects::MilestonesController < Projects::ApplicationController
   respond_to :html
 
   def index
-    @milestones = case params[:f]
+    @milestones = case params[:state]
                   when 'all'; @project.milestones.order("state, due_date DESC")
                   when 'closed'; @project.milestones.closed.order("due_date DESC")
                   else @project.milestones.active.order("due_date ASC")
-- 
cgit v1.2.1


From 8589b4e137f50293952923bb07e2814257d7784d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 8 Jan 2015 00:22:50 -0800
Subject: Init ApplicationSettings resource with defaults from config file

---
 .../admin/application_settings_controller.rb       | 31 ++++++++++++++++++++++
 app/controllers/registrations_controller.rb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/admin/application_settings_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
new file mode 100644
index 00000000000..d6e950b0007
--- /dev/null
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -0,0 +1,31 @@
+class Admin::ApplicationSettingsController < Admin::ApplicationController
+  before_filter :set_application_setting
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    @application_setting.update_attributes(application_setting_params)
+
+    redirect_to admin_application_settings_path
+  end
+
+  private
+
+  def set_application_setting
+    @application_setting = ApplicationSetting.last
+  end
+
+  def application_setting_params
+    params.require(:application_setting).permit(
+      :default_projects_limit,
+      :signup_enabled,
+      :signin_enabled,
+      :gravatar_enabled,
+      :sign_in_text,
+    )
+  end
+end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 6d3214b70a8..7c15eab4345 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -26,7 +26,9 @@ class RegistrationsController < Devise::RegistrationsController
   private
 
   def signup_enabled?
-    redirect_to new_user_session_path unless Gitlab.config.gitlab.signup_enabled
+    unless ApplicationSetting.current.signup_enabled
+      redirect_to new_user_session_path
+    end
   end
 
   def sign_up_params
-- 
cgit v1.2.1


From 57a65ede77b7bbae6e3b2a7aa52135de7b0c2f8e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 8 Jan 2015 09:53:35 -0800
Subject: Improve application settings and write tests

---
 .../admin/application_settings_controller.rb       | 12 ++++++------
 app/controllers/application_controller.rb          |  4 +++-
 app/controllers/registrations_controller.rb        |  4 ++--
 app/controllers/sessions_controller.rb             | 22 +++++++++++-----------
 4 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index d6e950b0007..39ca0b4feba 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -4,13 +4,13 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def show
   end
 
-  def edit
-  end
-
   def update
-    @application_setting.update_attributes(application_setting_params)
-
-    redirect_to admin_application_settings_path
+    if @application_setting.update_attributes(application_setting_params)
+      redirect_to admin_application_settings_path,
+        notice: 'Application settings saved successfully'
+    else
+      render :show
+    end
   end
 
   private
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4b8cae469e3..b83de68c5d2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,8 @@
 require 'gon'
 
 class ApplicationController < ActionController::Base
+  include Gitlab::CurrentSettings
+
   before_filter :authenticate_user_from_token!
   before_filter :authenticate_user!
   before_filter :reject_blocked!
@@ -13,7 +15,7 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery with: :exception
 
-  helper_method :abilities, :can?
+  helper_method :abilities, :can?, :current_application_settings
 
   rescue_from Encoding::CompatibilityError do |exception|
     log_exception(exception)
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 7c15eab4345..981dc2d8023 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -26,8 +26,8 @@ class RegistrationsController < Devise::RegistrationsController
   private
 
   def signup_enabled?
-    unless ApplicationSetting.current.signup_enabled
-      redirect_to new_user_session_path
+    if current_application_settings.signup_enabled?
+      redirect_to(new_user_session_path)
     end
   end
 
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5ced98152a5..7b6982c5074 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,16 +1,16 @@
 class SessionsController < Devise::SessionsController
-
   def new
-    redirect_path = if request.referer.present? && (params['redirect_to_referer'] == 'yes')
-                     referer_uri = URI(request.referer)
-                     if referer_uri.host == Gitlab.config.gitlab.host
-                       referer_uri.path
-                     else
-                       request.fullpath
-                     end
-                   else
-                     request.fullpath
-                   end
+    redirect_path =
+      if request.referer.present? && (params['redirect_to_referer'] == 'yes')
+        referer_uri = URI(request.referer)
+        if referer_uri.host == Gitlab.config.gitlab.host
+          referer_uri.path
+        else
+          request.fullpath
+        end
+      else
+        request.fullpath
+      end
 
     # Prevent a 'you are already signed in' message directly after signing:
     # we should never redirect to '/users/sign_in' after signing in successfully.
-- 
cgit v1.2.1


From d0a50985ec613584821806062df4eaa39337449c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 8 Jan 2015 11:26:16 -0800
Subject: Create ApplicationSettings if does not exist in runtime

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

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 39ca0b4feba..5116f1f177a 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -16,7 +16,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   private
 
   def set_application_setting
-    @application_setting = ApplicationSetting.last
+    @application_setting = ApplicationSetting.current
   end
 
   def application_setting_params
-- 
cgit v1.2.1


From 939c046a9872c1d7c38d73dc08860681ecebd1f1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 8 Jan 2015 13:21:00 -0800
Subject: Fix feature and tests

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

(limited to 'app/controllers')

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 981dc2d8023..52db44bf822 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -26,7 +26,7 @@ class RegistrationsController < Devise::RegistrationsController
   private
 
   def signup_enabled?
-    if current_application_settings.signup_enabled?
+    unless current_application_settings.signup_enabled?
       redirect_to(new_user_session_path)
     end
   end
-- 
cgit v1.2.1


From 9c03c1c545d1afeaf12d8ee1c204936cdf8c55e1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 9 Jan 2015 19:10:01 -0800
Subject: Make automerge via satellite

---
 app/controllers/projects/merge_requests_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d23461821d7..3f702b0af97 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -27,6 +27,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     respond_to do |format|
       format.html
+      format.json { render json: @merge_request }
       format.diff { render text: @merge_request.to_diff(current_user) }
       format.patch { render text: @merge_request.to_patch(current_user) }
     end
@@ -104,15 +105,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
-    render json: {merge_status: @merge_request.merge_status_name}
+
+    render json: { merge_status: @merge_request.merge_status_name }
   end
 
   def automerge
     return access_denied! unless allowed_to_merge?
 
     if @merge_request.open? && @merge_request.can_be_merged?
-      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
-      @merge_request.automerge!(current_user, params[:commit_message])
+      AutoMergeWorker.perform_async(@merge_request.id, current_user.id, params)
       @status = true
     else
       @status = false
-- 
cgit v1.2.1


From a9f7fd2c1a7052247333b89f6a22a883b480370d Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Wed, 31 Dec 2014 15:07:48 +0200
Subject: Github Importer

---
 app/controllers/github_imports_controller.rb     | 75 ++++++++++++++++++++++++
 app/controllers/omniauth_callbacks_controller.rb |  2 +-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/github_imports_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
new file mode 100644
index 00000000000..97a2637b1eb
--- /dev/null
+++ b/app/controllers/github_imports_controller.rb
@@ -0,0 +1,75 @@
+class GithubImportsController < ApplicationController
+  before_filter :github_auth, except: :callback
+
+  rescue_from Octokit::Unauthorized, with: :github_unauthorized
+  
+  def callback
+    token = client.auth_code.get_token(params[:code]).token
+    current_user.github_access_token = token
+    current_user.save
+    redirect_to status_github_import_url
+  end
+
+  def status
+    @repos = octo_client.repos
+    octo_client.orgs.each do |org|
+      @repos += octo_client.repos(org.login)
+    end
+
+    @already_added_projects = current_user.created_projects.where(import_type: "github")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
+  end
+
+  def create
+    @repo_id = params[:repo_id].to_i
+    repo = octo_client.repo(@repo_id)
+    target_namespace = params[:new_namespace].presence || repo.owner.login
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        @target_namespace = target_namespace
+        @project_name = repo.name
+        render and return
+      end
+    else
+      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+    end
+
+    Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::Github::Client.new.client
+  end
+
+  def octo_client
+    Octokit.auto_paginate = true
+    @octo_client ||= Octokit::Client.new(:access_token => current_user.github_access_token)
+  end
+
+  def github_auth
+    if current_user.github_access_token.blank?
+      go_to_gihub_for_permissions
+    end
+  end
+
+  def go_to_gihub_for_permissions
+    redirect_to client.auth_code.authorize_url({
+      redirect_uri: callback_github_import_url,
+      scope: "repo, user, user:email"
+    })
+  end
+
+  def github_unauthorized
+    go_to_gihub_for_permissions
+  end
+end
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 3e984e5007a..442a1cf7518 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -65,7 +65,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
       end
     end
-  rescue ForbiddenAction => e
+  rescue Gitlab::OAuth::ForbiddenAction => e
     flash[:notice] = e.message
     redirect_to new_user_session_path
   end
-- 
cgit v1.2.1


From 319704451233f4abfbb0e4bcc9bb3e0a756f5eb1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 11 Jan 2015 23:51:31 -0800
Subject: Refactor push data builder. Moved it to separate class

Also execute GitLab CI on creating tag via UI
---
 app/controllers/projects/services_controller.rb | 3 +--
 app/controllers/projects/tags_controller.rb     | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index ef4d2609147..9c203debc3f 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -24,8 +24,7 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def test
-    data = GitPushService.new.sample_data(project, current_user)
-
+    data = Gitlab::PushDataBuilder.build(project, current_user)
     @service.execute(data)
 
     redirect_to :back
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 162ddef0fec..64b820160d3 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -13,6 +13,7 @@ class Projects::TagsController < Projects::ApplicationController
   def create
     result = CreateTagService.new(@project, current_user).
       execute(params[:tag_name], params[:ref], params[:message])
+
     if result[:status] == :success
       @tag = result[:tag]
       redirect_to project_tags_path(@project)
-- 
cgit v1.2.1


From bba8e59a044f34a02000b752a70198fb74236b1d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 12 Jan 2015 09:08:25 -0800
Subject: Fix test hook and tests

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 9c203debc3f..b2ce99aeb45 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -24,7 +24,7 @@ class Projects::ServicesController < Projects::ApplicationController
   end
 
   def test
-    data = Gitlab::PushDataBuilder.build(project, current_user)
+    data = Gitlab::PushDataBuilder.build_sample(project, current_user)
     @service.execute(data)
 
     redirect_to :back
-- 
cgit v1.2.1


From 058f223b01c87fc45825c2459d36371166abfc27 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 12 Jan 2015 09:30:52 -0800
Subject: ForbiddenAction constant fix

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

(limited to 'app/controllers')

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 3e984e5007a..442a1cf7518 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -65,7 +65,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
       end
     end
-  rescue ForbiddenAction => e
+  rescue Gitlab::OAuth::ForbiddenAction => e
     flash[:notice] = e.message
     redirect_to new_user_session_path
   end
-- 
cgit v1.2.1


From 1e37e8924ab38cfbb2a838c2bc6589b03f72dbcd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 13 Jan 2015 11:44:17 -0800
Subject: Improve github import page UI

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

(limited to 'app/controllers')

diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
index 97a2637b1eb..c96bef598be 100644
--- a/app/controllers/github_imports_controller.rb
+++ b/app/controllers/github_imports_controller.rb
@@ -2,7 +2,7 @@ class GithubImportsController < ApplicationController
   before_filter :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
-  
+
   def callback
     token = client.auth_code.get_token(params[:code]).token
     current_user.github_access_token = token
-- 
cgit v1.2.1


From 41d7be3ce1ae9a4bff93b62322f35989b6ad4cf6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 16 Jan 2015 16:01:15 -0800
Subject: Allow to specify home page for non logged-in users

---
 app/controllers/admin/application_settings_controller.rb |  1 +
 app/controllers/application_controller.rb                | 11 +++++++++++
 2 files changed, 12 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 5116f1f177a..a937f484877 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -26,6 +26,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :signin_enabled,
       :gravatar_enabled,
       :sign_in_text,
+      :home_page_url
     )
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b83de68c5d2..4780a7a2a9a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -48,6 +48,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authenticate_user!
+    # If user is not signe-in and tries to access root_path - redirect him to landing page
+    if current_application_settings.home_page_url.present?
+      if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
+        redirect_to current_application_settings.home_page_url and return
+      end
+    end
+
+    super
+  end
+
   def log_exception(exception)
     application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
     application_trace.map!{ |t| "  #{t}\n" }
-- 
cgit v1.2.1


From f2eb234c068ccb57f100080a499d307b9b2f5502 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 16 Jan 2015 18:12:15 -0800
Subject: Fix passign args to original authenticate_user!

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

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4780a7a2a9a..6da4f91c3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def authenticate_user!
+  def authenticate_user!(*args)
     # If user is not signe-in and tries to access root_path - redirect him to landing page
     if current_application_settings.home_page_url.present?
       if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
@@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
       end
     end
 
-    super
+    super(*args)
   end
 
   def log_exception(exception)
-- 
cgit v1.2.1


From 8243eb3f0e3ee06a793831ae0899bfe409a31903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Sat, 17 Jan 2015 14:12:49 +0100
Subject: Show tags in commit view

---
 app/controllers/projects/commit_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index dac858d8e16..470efbd2114 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -12,6 +12,7 @@ class Projects::CommitController < Projects::ApplicationController
 
     @line_notes = @project.notes.for_commit_id(commit.id).inline
     @branches = @project.repository.branch_names_contains(commit.id)
+    @tags = @project.repository.tag_names_contains(commit.id)
     @diffs = @commit.diffs
     @note = @project.build_commit_note(commit)
     @notes_count = @project.notes.for_commit_id(commit.id).count
-- 
cgit v1.2.1


From 20028523b5a2969b70a1fde9468c434b78f916ea Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Sat, 17 Jan 2015 15:37:27 -0800
Subject: Application admin scaffold

---
 app/controllers/admin/applications_controller.rb | 52 ++++++++++++++++++++++++
 app/controllers/oauth/applications_controller.rb |  6 +--
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 app/controllers/admin/applications_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
new file mode 100644
index 00000000000..cba19184dba
--- /dev/null
+++ b/app/controllers/admin/applications_controller.rb
@@ -0,0 +1,52 @@
+class Admin::ApplicationsController < Admin::ApplicationController
+  before_action :set_application, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @applications = Doorkeeper::Application.where("owner_id IS NULL")
+  end
+
+  def show
+  end
+
+  def new
+    @application = Doorkeeper::Application.new
+  end
+
+  def edit
+  end
+
+  def create
+    @application = Doorkeeper::Application.new(application_params)
+    
+    if @application.save
+      flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
+      redirect_to admin_application_url(@application)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @application.update(application_params)
+      redirect_to admin_application_path(@application), notice: 'Application was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @application.destroy
+    redirect_to admin_applications_url, notice: 'Application was successfully destroyed.'
+  end
+
+  private
+
+  def set_application
+    @application = Doorkeeper::Application.where("owner_id IS NULL").find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def application_params
+    params[:doorkeeper_application].permit(:name, :redirect_uri)
+  end
+end
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index 3407490e498..efa291d9397 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -9,10 +9,8 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   def create
     @application = Doorkeeper::Application.new(application_params)
 
-    if Doorkeeper.configuration.confirm_application_owner?
-      @application.owner = current_user
-    end
-
+    @application.owner = current_user
+    
     if @application.save
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
       redirect_to oauth_application_url(@application)
-- 
cgit v1.2.1


From a81081aa72ad516d685152ea4790f9156262ab92 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 17 Jan 2015 16:17:34 -0800
Subject: Small improvements to CI

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

(limited to 'app/controllers')

diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
index cba19184dba..471d24934a0 100644
--- a/app/controllers/admin/applications_controller.rb
+++ b/app/controllers/admin/applications_controller.rb
@@ -17,7 +17,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
 
   def create
     @application = Doorkeeper::Application.new(application_params)
-    
+
     if @application.save
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
       redirect_to admin_application_url(@application)
-- 
cgit v1.2.1


From 5c801602189bdf179432e9ef5885f6c6fef438f2 Mon Sep 17 00:00:00 2001
From: Steven Burgart <skburgart@gmail.com>
Date: Sun, 18 Jan 2015 10:29:37 -0500
Subject: Fix various typos

signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
---
 app/controllers/application_controller.rb    | 2 +-
 app/controllers/github_imports_controller.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6da4f91c3f4..ad13a0ac3e4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
   end
 
   def authenticate_user!(*args)
-    # If user is not signe-in and tries to access root_path - redirect him to landing page
+    # If user is not signed-in and tries to access root_path - redirect him to landing page
     if current_application_settings.home_page_url.present?
       if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
         redirect_to current_application_settings.home_page_url and return
diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
index c96bef598be..86e20b16646 100644
--- a/app/controllers/github_imports_controller.rb
+++ b/app/controllers/github_imports_controller.rb
@@ -58,11 +58,11 @@ class GithubImportsController < ApplicationController
 
   def github_auth
     if current_user.github_access_token.blank?
-      go_to_gihub_for_permissions
+      go_to_github_for_permissions
     end
   end
 
-  def go_to_gihub_for_permissions
+  def go_to_github_for_permissions
     redirect_to client.auth_code.authorize_url({
       redirect_uri: callback_github_import_url,
       scope: "repo, user, user:email"
@@ -70,6 +70,6 @@ class GithubImportsController < ApplicationController
   end
 
   def github_unauthorized
-    go_to_gihub_for_permissions
+    go_to_github_for_permissions
   end
 end
-- 
cgit v1.2.1


From 6da0ab7d60ecdf189190ac095aecdf174e73a03e Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 20 Jan 2015 11:52:55 -0800
Subject: Github Importer: AJAX update status

---
 app/controllers/github_imports_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
index c96bef598be..ac5cfd8d45d 100644
--- a/app/controllers/github_imports_controller.rb
+++ b/app/controllers/github_imports_controller.rb
@@ -22,6 +22,11 @@ class GithubImportsController < ApplicationController
     @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
   end
 
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "github").to_json(:only => [:id, :import_status])
+    render json: jobs
+  end
+
   def create
     @repo_id = params[:repo_id].to_i
     repo = octo_client.repo(@repo_id)
@@ -42,7 +47,7 @@ class GithubImportsController < ApplicationController
       namespace.add_owner(current_user)
     end
 
-    Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
   end
 
   private
-- 
cgit v1.2.1


From 62c00661c43334f8e2bbed508d9517529dbee7e0 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Tue, 20 Jan 2015 16:47:29 -0800
Subject: Allow creation of the jira and redmine services.

---
 app/controllers/projects/services_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index b2ce99aeb45..15f47ed9c9f 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -17,7 +17,8 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
-      redirect_to edit_project_service_path(@project, @service.to_param)
+      redirect_to edit_project_service_path(@project, @service.to_param),
+       notice: 'Successfully updated.'
     else
       render 'edit'
     end
@@ -41,7 +42,8 @@ class Projects::ServicesController < Projects::ApplicationController
       :title, :token, :type, :active, :api_key, :subdomain,
       :room, :recipients, :project_url, :webhook,
       :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
-      :build_key, :server, :teamcity_url, :build_type
+      :build_key, :server, :teamcity_url, :build_type,
+      :description, :issues_url, :new_issue_url
     )
   end
 end
-- 
cgit v1.2.1


From ab7a79bf3bb47fd1c9d82da0bb29a3cdf0246cdc Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 20 Jan 2015 15:23:37 -0800
Subject: developer can push to protected branches

---
 app/controllers/projects/merge_requests_controller.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 3f702b0af97..912f9eb5b6b 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -233,13 +233,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def allowed_to_push_code?(project, branch)
-    action = if project.protected_branch?(branch)
-               :push_code_to_protected_branches
-             else
-               :push_code
-             end
-
-    can?(current_user, action, project)
+    ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, branch)
   end
 
   def merge_request_params
-- 
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')

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')

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')

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 3dfcb95f0d5a9851b3829f357bc53abb96c0e6ba Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 23 Jan 2015 17:41:10 -0800
Subject: Use ruby 1.9 hash syntax

---
 app/controllers/passwords_controller.rb                   | 4 ++--
 app/controllers/projects/protected_branches_controller.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 988ede3007b..dcbbe5baa4b 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -5,12 +5,12 @@ class PasswordsController < Devise::PasswordsController
     resource_found = resource_class.find_by_email(email)
     if resource_found && resource_found.ldap_user?
       flash[:alert] = "Cannot reset password for LDAP user."
-      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name)) and return
+      respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name)) and return
     end
 
     self.resource = resource_class.send_reset_password_instructions(resource_params)
     if successfully_sent?(resource)
-      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
+      respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
     else
       respond_with(resource)
     end
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index 02160d973b3..f45df38b87c 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -24,7 +24,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
        )
 
       respond_to do |format|
-        format.json { render :json => protected_branch, status: :ok }
+        format.json { render json: protected_branch, status: :ok }
       end
     else
       respond_to do |format|
-- 
cgit v1.2.1


From a6bdf7d8769c1726084f42a510b6aed097fffbf2 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 23 Jan 2015 20:50:17 -0800
Subject: Show success/error message for test services button

---
 app/controllers/projects/services_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index b2ce99aeb45..5ac6947c5de 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -25,9 +25,13 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def test
     data = Gitlab::PushDataBuilder.build_sample(project, current_user)
-    @service.execute(data)
+    if @service.execute(data)
+      message = { notice: 'We sent a request to the provided URL' }
+    else
+      message = { alert: 'We tried to send a request to the provided URL but error occured' }
+    end
 
-    redirect_to :back
+    redirect_to :back, message
   end
 
   private
-- 
cgit v1.2.1


From 42bac7f9f27b0e8fb113e452fc2106882262172d Mon Sep 17 00:00:00 2001
From: Steven Thonus <steven@ln2.nl>
Date: Sat, 25 Jan 2014 18:15:44 +0100
Subject: adding avatar to project settings page added avatar removal show
 project avatar on dashboard, projects page, project page added rspec and
 feature tests added project avatar from repository new default project icon
 added added copying af avatar to forking of project added generated icon
 fixed avatar fork hound fix style fix test fix

---
 app/controllers/projects/avatars_controller.rb | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 app/controllers/projects/avatars_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
new file mode 100644
index 00000000000..a482b90880d
--- /dev/null
+++ b/app/controllers/projects/avatars_controller.rb
@@ -0,0 +1,29 @@
+class Projects::AvatarsController < Projects::ApplicationController
+  layout 'project'
+
+  before_filter :project
+
+  def show
+    @blob = @project.repository.blob_at_branch('master', @project.avatar_in_git)
+    if @blob
+      headers['X-Content-Type-Options'] = 'nosniff'
+      send_data(
+        @blob.data,
+        type: @blob.mime_type,
+        disposition: 'inline',
+        filename: @blob.name
+      )
+    else
+      not_found!
+    end
+  end
+
+  def destroy
+    @project.remove_avatar!
+
+    @project.save
+    @project.reset_events_cache
+
+    redirect_to edit_project_path(@project)
+  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')

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 aad6ceaef9ccfba8e058012a0877b80c103a3838 Mon Sep 17 00:00:00 2001
From: Marco Wessel <marco@poop.nl>
Date: Sun, 25 Jan 2015 16:33:54 +0100
Subject: Allow configuring protection of the default branch upon first push

---
 app/controllers/admin/application_settings_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index a937f484877..7458542fc73 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -22,6 +22,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def application_setting_params
     params.require(:application_setting).permit(
       :default_projects_limit,
+      :default_branch_protection,
       :signup_enabled,
       :signin_enabled,
       :gravatar_enabled,
-- 
cgit v1.2.1


From 65e700472b471242475eb9d9e3a340c6ce24615a Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 26 Jan 2015 11:39:32 -0800
Subject: Update the issue tracker attribute on issue tracker change.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 15f47ed9c9f..a2cb4ae1ae9 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -17,6 +17,9 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
+      if @service.activated? && @service.category == :issue_tracker
+        @project.update_attributes(issues_tracker: @service.to_param)
+      end
       redirect_to edit_project_service_path(@project, @service.to_param),
        notice: 'Successfully updated.'
     else
-- 
cgit v1.2.1


From c916124178645412a554a6b8b39c05bbd42269c8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 15:01:51 -0800
Subject: Explicitly set before_filter for ref-related controllers

---
 app/controllers/projects/blame_controller.rb   | 2 +-
 app/controllers/projects/commits_controller.rb | 2 +-
 app/controllers/projects/network_controller.rb | 2 +-
 app/controllers/projects/raw_controller.rb     | 2 +-
 app/controllers/projects/refs_controller.rb    | 2 +-
 app/controllers/projects/tree_controller.rb    | 9 +++++++--
 6 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index 367d1295f34..106f21b83e6 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -2,7 +2,7 @@
 class Projects::BlameController < Projects::ApplicationController
   include ExtractsPath
 
-  # Authorize
+  before_filter :assign_ref_vars
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 9476b6c0284..0a85c36a758 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -3,7 +3,7 @@ require "base64"
 class Projects::CommitsController < Projects::ApplicationController
   include ExtractsPath
 
-  # Authorize
+  before_filter :assign_ref_vars
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index ada1aed0df7..59f2a745367 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -2,7 +2,7 @@ class Projects::NetworkController < Projects::ApplicationController
   include ExtractsPath
   include ApplicationHelper
 
-  # Authorize
+  before_filter :assign_ref_vars
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index fdbc4c5a098..84888265dc1 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -2,7 +2,7 @@
 class Projects::RawController < Projects::ApplicationController
   include ExtractsPath
 
-  # Authorize
+  before_filter :assign_ref_vars
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index 67665f5f601..cede0ebe0ae 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -1,7 +1,7 @@
 class Projects::RefsController < Projects::ApplicationController
   include ExtractsPath
 
-  # Authorize
+  before_filter :assign_ref_vars
   before_filter :authorize_download_code!
   before_filter :require_non_empty_project
 
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 4d033b36848..5b52640a4e1 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -1,7 +1,12 @@
 # Controller for viewing a repository's file structure
-class Projects::TreeController < Projects::BaseTreeController
-  def show
+class Projects::TreeController < Projects::ApplicationController
+  include ExtractsPath
+
+  before_filter :assign_ref_vars
+  before_filter :authorize_download_code!
+  before_filter :require_non_empty_project, except: [:new, :create]
 
+  def show
     if tree.entries.empty?
       if @repository.blob_at(@commit.id, @path)
         redirect_to project_blob_path(@project, File.join(@ref, @path)) and return
-- 
cgit v1.2.1


From 59b08942aa3de480899f32f1a6f2f948329ae3fc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 15:02:28 -0800
Subject: Refactor blob controllers

---
 app/controllers/projects/base_tree_controller.rb |  7 --
 app/controllers/projects/blob_controller.rb      | 98 ++++++++++++++++++++++--
 app/controllers/projects/edit_tree_controller.rb | 60 ---------------
 app/controllers/projects/new_tree_controller.rb  | 20 -----
 4 files changed, 93 insertions(+), 92 deletions(-)
 delete mode 100644 app/controllers/projects/base_tree_controller.rb
 delete mode 100644 app/controllers/projects/edit_tree_controller.rb
 delete mode 100644 app/controllers/projects/new_tree_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/projects/base_tree_controller.rb b/app/controllers/projects/base_tree_controller.rb
deleted file mode 100644
index a7b1b7b40e8..00000000000
--- a/app/controllers/projects/base_tree_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Projects::BaseTreeController < Projects::ApplicationController
-  include ExtractsPath
-
-  before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
-end
-
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 2412800c493..00b82ff1df3 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -2,16 +2,70 @@
 class Projects::BlobController < Projects::ApplicationController
   include ExtractsPath
 
-  # Authorize
+  # Raised when given an invalid file path
+  class InvalidPathError < StandardError; end
+
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
+  before_filter :require_non_empty_project, except: [:new, :create]
   before_filter :authorize_push_code!, only: [:destroy]
+  before_filter :assign_blob_vars
+  before_filter :commit, except: [:new, :create]
+  before_filter :blob, except: [:new, :create]
+  before_filter :from_merge_request, only: [:edit, :update]
+  before_filter :after_edit_path, only: [:edit, :update]
+  before_filter :require_branch_head, only: [:edit, :update]
+
+  def new
+    commit unless @repository.empty?
+  end
 
-  before_filter :blob
+  def create
+    file_path = File.join(@path, File.basename(params[:file_name]))
+    result = Files::CreateService.new(@project, current_user, params, @ref, file_path).execute
+
+    if result[:status] == :success
+      flash[:notice] = "Your changes have been successfully committed"
+      redirect_to project_blob_path(@project, File.join(@ref, file_path))
+    else
+      flash[:alert] = result[:message]
+      render :show
+    end
+  end
 
   def show
   end
 
+  def edit
+    @last_commit = Gitlab::Git::Commit.last_for_path(@repository, @ref, @path).sha
+  end
+
+  def update
+    result = Files::UpdateService.
+      new(@project, current_user, params, @ref, @path).execute
+
+    if result[:status] == :success
+      flash[:notice] = "Your changes have been successfully committed"
+
+      if from_merge_request
+        from_merge_request.reload_code
+      end
+
+      redirect_to after_edit_path
+    else
+      flash[:alert] = result[:message]
+      render :show
+    end
+  end
+
+  def preview
+    @content = params[:content]
+    diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
+                            include_diff_info: true)
+    @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/))
+
+    render layout: false
+  end
+
   def destroy
     result = Files::DeleteService.new(@project, current_user, params, @ref, @path).execute
 
@@ -46,10 +100,44 @@ class Projects::BlobController < Projects::ApplicationController
 
     if @blob
       @blob
-    elsif tree.entries.any?
-      redirect_to project_tree_path(@project, File.join(@ref, @path)) and return
     else
+      if tree = @repository.tree(@commit.id, @path)
+        if tree.entries.any?
+          redirect_to project_tree_path(@project, File.join(@ref, @path)) and return
+        end
+      end
+
       return not_found!
     end
   end
+
+  def commit
+    @commit = @repository.commit(@ref)
+
+    return not_found! unless @commit
+  end
+
+  def assign_blob_vars
+    @id = params[:id]
+    @ref, @path = extract_ref(@id)
+
+
+  rescue InvalidPathError
+    not_found!
+  end
+
+  def after_edit_path
+    @after_edit_path ||=
+      if from_merge_request
+        diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request) +
+          "#file-path-#{hexdigest(@path)}"
+      else
+        project_blob_path(@project, @id)
+      end
+  end
+
+  def from_merge_request
+    # If blob edit was initiated from merge request page
+    @from_merge_request ||= MergeRequest.find_by(id: params[:from_merge_request_id])
+  end
 end
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb
deleted file mode 100644
index 65661c80410..00000000000
--- a/app/controllers/projects/edit_tree_controller.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-class Projects::EditTreeController < Projects::BaseTreeController
-  before_filter :require_branch_head
-  before_filter :blob
-  before_filter :authorize_push_code!
-  before_filter :from_merge_request
-  before_filter :after_edit_path
-
-  def show
-    @last_commit = Gitlab::Git::Commit.last_for_path(@repository, @ref, @path).sha
-  end
-
-  def update
-    result = Files::UpdateService.
-      new(@project, current_user, params, @ref, @path).execute
-
-    if result[:status] == :success
-      flash[:notice] = "Your changes have been successfully committed"
-
-      if from_merge_request
-        from_merge_request.reload_code
-      end
-
-      redirect_to after_edit_path
-    else
-      flash[:alert] = result[:message]
-      render :show
-    end
-  end
-
-  def preview
-    @content = params[:content]
-
-    diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
-                            include_diff_info: true)
-    @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/))
-
-    render layout: false
-  end
-
-  private
-
-  def blob
-    @blob ||= @repository.blob_at(@commit.id, @path)
-  end
-
-  def after_edit_path
-    @after_edit_path ||=
-      if from_merge_request
-        diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request) +
-          "#file-path-#{hexdigest(@path)}"
-      else
-        project_blob_path(@project, @id)
-      end
-  end
-
-  def from_merge_request
-    # If blob edit was initiated from merge request page
-    @from_merge_request ||= MergeRequest.find_by(id: params[:from_merge_request_id])
-  end
-end
diff --git a/app/controllers/projects/new_tree_controller.rb b/app/controllers/projects/new_tree_controller.rb
deleted file mode 100644
index ffba706b2f6..00000000000
--- a/app/controllers/projects/new_tree_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class Projects::NewTreeController < Projects::BaseTreeController
-  before_filter :require_branch_head
-  before_filter :authorize_push_code!
-
-  def show
-  end
-
-  def update
-    file_path = File.join(@path, File.basename(params[:file_name]))
-    result = Files::CreateService.new(@project, current_user, params, @ref, file_path).execute
-
-    if result[:status] == :success
-      flash[:notice] = "Your changes have been successfully committed"
-      redirect_to project_blob_path(@project, File.join(@ref, file_path))
-    else
-      flash[:alert] = result[:message]
-      render :show
-    end
-  end
-end
-- 
cgit v1.2.1


From ed9137862773c8cd242e16a7945cf18a0b2e1ff9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 15:12:13 -0800
Subject: Fix blob controller rendering in case of errors

---
 app/controllers/projects/blob_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 00b82ff1df3..b471d57f698 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -28,7 +28,7 @@ class Projects::BlobController < Projects::ApplicationController
       redirect_to project_blob_path(@project, File.join(@ref, file_path))
     else
       flash[:alert] = result[:message]
-      render :show
+      render :new
     end
   end
 
@@ -53,7 +53,7 @@ class Projects::BlobController < Projects::ApplicationController
       redirect_to after_edit_path
     else
       flash[:alert] = result[:message]
-      render :show
+      render :edit
     end
   end
 
-- 
cgit v1.2.1


From ededa98995208591c5792c0ece1a5ec0ef302127 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 26 Jan 2015 22:46:54 -0800
Subject: Shorter check in services controller.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index c7cc38b9c67..09bccb4bf8f 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -17,7 +17,7 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
-      if @service.activated? && @service.category == :issue_tracker
+      if @service.activated? && @service.issue_tracker?
         @project.update_attributes(issues_tracker: @service.to_param)
       end
       redirect_to edit_project_service_path(@project, @service.to_param),
-- 
cgit v1.2.1


From 537cd66d7e4237f0df6db88b3225327c8e4140c5 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 28 Jan 2015 09:28:17 -0800
Subject: Add gitlab internal issue tracker service.

---
 app/controllers/application_controller.rb       | 2 +-
 app/controllers/projects/services_controller.rb | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ad13a0ac3e4..36e13706768 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
   end
 
   def add_gon_variables
-    gon.default_issues_tracker = Project.issues_tracker.default_value
+    gon.default_issues_tracker = Project.new.default_issue_tracker.to_param
     gon.api_version = API::API.version
     gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
     gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 09bccb4bf8f..5dda869a154 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def index
     @project.build_missing_services
-    @services = @project.services.reload
+    @services = @project.services.where.not(type: 'GitlabIssueTrackerService').reload
   end
 
   def edit
@@ -17,9 +17,6 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
-      if @service.activated? && @service.issue_tracker?
-        @project.update_attributes(issues_tracker: @service.to_param)
-      end
       redirect_to edit_project_service_path(@project, @service.to_param),
        notice: 'Successfully updated.'
     else
-- 
cgit v1.2.1


From 68f7302474768351abf12767c7741823f56f35cd Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 28 Jan 2015 14:25:55 -0800
Subject: Add a scope for visible services, code styling changes for easier
 readability.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 5dda869a154..5b35cc90413 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def index
     @project.build_missing_services
-    @services = @project.services.where.not(type: 'GitlabIssueTrackerService').reload
+    @services = @project.services.visible.reload
   end
 
   def edit
-- 
cgit v1.2.1


From 792ced2f4190226c3335967a8e5a30d3b72bd4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Wed, 28 Jan 2015 22:18:22 +0100
Subject: Add a commit calendar to the user profile

---
 app/controllers/users_controller.rb | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 67af1801bda..a5e80f7e008 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  skip_before_filter :authenticate_user!, only: [:show]
+  skip_before_filter :authenticate_user!, only: [:show, :activities]
   layout :determine_layout
 
   def show
@@ -10,7 +10,8 @@ class UsersController < ApplicationController
     end
 
     # Projects user can view
-    authorized_projects_ids = ProjectsFinder.new.execute(current_user).pluck(:id)
+    visible_projects = ProjectsFinder.new.execute(current_user)
+    authorized_projects_ids = visible_projects.pluck(:id)
 
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids)
@@ -24,12 +25,32 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    user_repositories = visible_projects.map(&:repository)
+    @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
+                                                           @user, false)
+    @starting_year = Gitlab::CommitsCalendar.starting_year(@timestamps)
+    @starting_month = Gitlab::CommitsCalendar.starting_month(@timestamps)
+    @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
+
     respond_to do |format|
       format.html
       format.atom { render layout: false }
     end
   end
 
+  def activities
+    user = User.find_by_username!(params[:username])
+    # Projects user can view
+    visible_projects = ProjectsFinder.new.execute(current_user)
+
+    user_repositories = visible_projects.map(&:repository)
+    user_activities = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
+                                                               user, true)
+    user_activities = Gitlab::CommitsCalendar.commit_activity_match(
+                                              user_activities, params[:date])
+    render json: user_activities.to_json
+  end
+
   def determine_layout
     if current_user
       'navless'
-- 
cgit v1.2.1


From c39f80bdb412bc9cc7646de0929efe8cb5b870d4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 28 Jan 2015 23:00:41 -0800
Subject: Refactor commit calendar a bit. Fixed dates

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

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a5e80f7e008..28de2707778 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,8 +28,8 @@ class UsersController < ApplicationController
     user_repositories = visible_projects.map(&:repository)
     @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
                                                            @user, false)
-    @starting_year = Gitlab::CommitsCalendar.starting_year(@timestamps)
-    @starting_month = Gitlab::CommitsCalendar.starting_month(@timestamps)
+    @starting_year = (Time.now - 1.year).strftime("%Y")
+    @starting_month = Date.today.strftime("%m").to_i
     @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
 
     respond_to do |format|
-- 
cgit v1.2.1


From a9288e554e55e843b95ab6f8109a4c610af64c83 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 00:53:43 -0800
Subject: Cleanup and make contribution calendar faster

---
 app/controllers/users_controller.rb | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 28de2707778..9e5ea6cfa45 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -25,12 +25,12 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    # Get user repositories and collect timestamps for commits
     user_repositories = visible_projects.map(&:repository)
-    @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
-                                                           @user, false)
+    calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
+    @timestamps = calendar.timestamps
     @starting_year = (Time.now - 1.year).strftime("%Y")
     @starting_month = Date.today.strftime("%m").to_i
-    @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
 
     respond_to do |format|
       format.html
@@ -38,19 +38,6 @@ class UsersController < ApplicationController
     end
   end
 
-  def activities
-    user = User.find_by_username!(params[:username])
-    # Projects user can view
-    visible_projects = ProjectsFinder.new.execute(current_user)
-
-    user_repositories = visible_projects.map(&:repository)
-    user_activities = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
-                                                               user, true)
-    user_activities = Gitlab::CommitsCalendar.commit_activity_match(
-                                              user_activities, params[:date])
-    render json: user_activities.to_json
-  end
-
   def determine_layout
     if current_user
       'navless'
-- 
cgit v1.2.1


From 1f0e16569f1924ed967bff9f4f78bbee874251db Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 01:20:17 -0800
Subject: Load contribution calendar via AJAX

---
 app/controllers/users_controller.rb | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9e5ea6cfa45..8c96f67a2a4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,14 +1,7 @@
 class UsersController < ApplicationController
-  skip_before_filter :authenticate_user!, only: [:show, :activities]
   layout :determine_layout
 
   def show
-    @user = User.find_by_username!(params[:username])
-
-    unless current_user || @user.public_profile?
-      return authenticate_user!
-    end
-
     # Projects user can view
     visible_projects = ProjectsFinder.new.execute(current_user)
     authorized_projects_ids = visible_projects.pluck(:id)
@@ -25,6 +18,15 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    respond_to do |format|
+      format.html
+      format.atom { render layout: false }
+    end
+  end
+
+  def calendar
+    visible_projects = ProjectsFinder.new.execute(current_user)
+
     # Get user repositories and collect timestamps for commits
     user_repositories = visible_projects.map(&:repository)
     calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
@@ -32,10 +34,7 @@ class UsersController < ApplicationController
     @starting_year = (Time.now - 1.year).strftime("%Y")
     @starting_month = Date.today.strftime("%m").to_i
 
-    respond_to do |format|
-      format.html
-      format.atom { render layout: false }
-    end
+    render 'calendar', layout: false
   end
 
   def determine_layout
@@ -45,4 +44,14 @@ class UsersController < ApplicationController
       'public_users'
     end
   end
+
+  private
+
+  def authenticate_user!
+    @user = User.find_by_username!(params[:username])
+
+    unless current_user || @user.public_profile?
+      return authenticate_user!
+    end
+  end
 end
-- 
cgit v1.2.1


From 08582f153249d91d361977d7968126a420739a8b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 08:55:57 -0800
Subject: Improve user calendar authentification and tests

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

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c96f67a2a4..ff5e31067fb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,6 @@
 class UsersController < ApplicationController
+  skip_before_filter :authenticate_user!
+  before_filter :set_user
   layout :determine_layout
 
   def show
@@ -47,7 +49,7 @@ class UsersController < ApplicationController
 
   private
 
-  def authenticate_user!
+  def set_user
     @user = User.find_by_username!(params[:username])
 
     unless current_user || @user.public_profile?
-- 
cgit v1.2.1


From f1cf49218fb40b61f82ff74dbb7eaba32b439a5a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 17:07:44 -0800
Subject: Improve contribution calendar on user page

* cache user contributions for day
* ignore forks in calendar contribtuions
---
 app/controllers/users_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ff5e31067fb..57d8ef09faf 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,13 +28,10 @@ class UsersController < ApplicationController
 
   def calendar
     visible_projects = ProjectsFinder.new.execute(current_user)
-
-    # Get user repositories and collect timestamps for commits
-    user_repositories = visible_projects.map(&:repository)
-    calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
+    calendar = Gitlab::CommitsCalendar.new(visible_projects, @user)
     @timestamps = calendar.timestamps
-    @starting_year = (Time.now - 1.year).strftime("%Y")
-    @starting_month = Date.today.strftime("%m").to_i
+    @starting_year = calendar.starting_year
+    @starting_month = calendar.starting_month
 
     render 'calendar', layout: false
   end
-- 
cgit v1.2.1


From 3cd1eda5a4f8e4ac95ebab558e8965724481dd97 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy.benoist@gmail.com>
Date: Fri, 16 Jan 2015 12:49:50 +0100
Subject: Add restrict_to_branch to service controller

And add restrict_to_branch to spec
---
 app/controllers/projects/services_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 5b35cc90413..b3110eacc18 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -47,7 +47,7 @@ class Projects::ServicesController < Projects::ApplicationController
       :room, :recipients, :project_url, :webhook,
       :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
       :build_key, :server, :teamcity_url, :build_type,
-      :description, :issues_url, :new_issue_url
+      :description, :issues_url, :new_issue_url, :restrict_to_branch
     )
   end
 end
-- 
cgit v1.2.1


From 4f1d1fc51baf396d49f6b159c84e15194706847c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 19:30:09 -0800
Subject: Convert hashes to ruby 1.9 style

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

(limited to 'app/controllers')

diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
index 3c5448bc709..b73e3f7ffac 100644
--- a/app/controllers/github_imports_controller.rb
+++ b/app/controllers/github_imports_controller.rb
@@ -23,7 +23,7 @@ class GithubImportsController < ApplicationController
   end
 
   def jobs
-    jobs = current_user.created_projects.where(import_type: "github").to_json(:only => [:id, :import_status])
+    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
     render json: jobs
   end
 
@@ -58,7 +58,7 @@ class GithubImportsController < ApplicationController
 
   def octo_client
     Octokit.auto_paginate = true
-    @octo_client ||= Octokit::Client.new(:access_token => current_user.github_access_token)
+    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
   end
 
   def github_auth
-- 
cgit v1.2.1


From e89058268118e3b2be4ebaf5d7bf2c684b590437 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 20:36:54 -0800
Subject: Rubocop enabled for: Use spaces inside hash literal braces

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

(limited to 'app/controllers')

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 312e561b522..1ed3bc388fb 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -27,7 +27,7 @@ class SnippetsController < ApplicationController
     @snippets = SnippetsFinder.new.execute(current_user, {
       filter: :by_user,
       user: @user,
-      scope: params[:scope]}).
+      scope: params[:scope] }).
     page(params[:page]).per(20)
 
     if @user == current_user
-- 
cgit v1.2.1


From cc39bca3fa71930421f1c46844b4d02d5ff93e8b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 21:15:44 -0800
Subject: Rubocop: Style/AlignHash enabled

---
 app/controllers/projects/blob_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index b471d57f698..dccb96ba1d1 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -59,8 +59,7 @@ class Projects::BlobController < Projects::ApplicationController
 
   def preview
     @content = params[:content]
-    diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
-                            include_diff_info: true)
+    diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3', include_diff_info: true)
     @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/))
 
     render layout: false
-- 
cgit v1.2.1


From 647ff6240ef5e8256a44b126aa7573812d5e70b7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 21:38:50 -0800
Subject: Rubocop: Style/ElseAlignment enabled

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index cede0ebe0ae..b80472f8eb4 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -31,10 +31,10 @@ class Projects::RefsController < Projects::ApplicationController
 
   def logs_tree
     @offset = if params[:offset].present?
-             params[:offset].to_i
-           else
-             0
-           end
+                params[:offset].to_i
+              else
+                0
+              end
 
     @limit = 25
 
-- 
cgit v1.2.1


From d04344373b899c1e54948ca46478f7b907a576d2 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 21:53:27 -0800
Subject: Rubocop: no trailing newlines

---
 app/controllers/namespaces_controller.rb   | 1 -
 app/controllers/projects/raw_controller.rb | 1 -
 2 files changed, 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb
index c59a2401cef..b7a9d8c1291 100644
--- a/app/controllers/namespaces_controller.rb
+++ b/app/controllers/namespaces_controller.rb
@@ -15,4 +15,3 @@ class NamespacesController < ApplicationController
     end
   end
 end
-
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index 84888265dc1..c4ddc32e8c3 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -35,4 +35,3 @@ class Projects::RawController < Projects::ApplicationController
     end
   end
 end
-
-- 
cgit v1.2.1


From 61cc6a9244f316f684cd887febd9dae1030a04b0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Feb 2015 21:59:28 -0800
Subject: Rubocop: indentation fixes Yay!!!

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 0e03956e738..0145207bf6f 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -16,16 +16,16 @@ class Projects::WikisController < Projects::ApplicationController
     if @page
       render 'show'
     elsif file = @project_wiki.find_file(params[:id], params[:version_id])
-       if file.on_disk?
-         send_file file.on_disk_path, disposition: 'inline'
-       else
-         send_data(
-           file.raw_data,
-           type: file.mime_type,
-           disposition: 'inline',
-           filename: file.name
-         )
-       end
+      if file.on_disk?
+        send_file file.on_disk_path, disposition: 'inline'
+      else
+        send_data(
+          file.raw_data,
+          type: file.mime_type,
+          disposition: 'inline',
+          filename: file.name
+        )
+      end
     else
       return render('empty') unless can?(current_user, :write_wiki, @project)
       @page = WikiPage.new(@project_wiki)
-- 
cgit v1.2.1


From b9d9ac82a9d650b659866ea26dcb4e7987f10381 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 2 Feb 2015 21:30:11 -0800
Subject: Commit page: async load branches info

Conflicts:
	config/routes.rb
---
 app/controllers/projects/commit_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 470efbd2114..96a782bdf7a 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -11,8 +11,6 @@ class Projects::CommitController < Projects::ApplicationController
     return git_not_found! unless @commit
 
     @line_notes = @project.notes.for_commit_id(commit.id).inline
-    @branches = @project.repository.branch_names_contains(commit.id)
-    @tags = @project.repository.tag_names_contains(commit.id)
     @diffs = @commit.diffs
     @note = @project.build_commit_note(commit)
     @notes_count = @project.notes.for_commit_id(commit.id).count
@@ -31,6 +29,12 @@ class Projects::CommitController < Projects::ApplicationController
     end
   end
 
+  def branches
+    @branches = @project.repository.branch_names_contains(commit.id)
+    @tags = @project.repository.tag_names_contains(commit.id)
+    render layout: false
+  end
+
   def commit
     @commit ||= @project.repository.commit(params[:id])
   end
-- 
cgit v1.2.1


From f4ce0ddde44c278af9c7a9f198c9893d7db7472d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 4 Feb 2015 15:35:10 +0100
Subject: Show image attachments in browser instead of downloading them.

Resolves #1702.
---
 app/controllers/files_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 7937454810d..9671245d3f4 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -5,7 +5,8 @@ class FilesController < ApplicationController
 
     if uploader.file_storage?
       if can?(current_user, :read_project, note.project)
-        send_file uploader.file.path, disposition: 'attachment'
+        disposition = uploader.image? ? 'inline' : 'attachment'
+        send_file uploader.file.path, disposition: disposition
       else
         not_found!
       end
-- 
cgit v1.2.1


From ab22caa97e4c1d749f1acfa344c0b1c91eba598b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 5 Feb 2015 15:56:28 +0100
Subject: Redirect signup page to signin page.

Resolves #1916.
---
 app/controllers/registrations_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 97aa2d9bdb4..38d116a4ee3 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,6 +1,10 @@
 class RegistrationsController < Devise::RegistrationsController
   before_filter :signup_enabled?
 
+  def new
+    redirect_to(new_user_session_path)
+  end
+
   def destroy
     current_user.destroy
 
-- 
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')

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 5194214e3a2f97accf0c8119b4cb39fd4fcef5db Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 27 Jan 2015 15:37:19 -0800
Subject: GitLab integration. Importer

---
 app/controllers/github_imports_controller.rb    | 80 -------------------------
 app/controllers/importers/githubs_controller.rb | 80 +++++++++++++++++++++++++
 app/controllers/importers/gitlabs_controller.rb | 69 +++++++++++++++++++++
 3 files changed, 149 insertions(+), 80 deletions(-)
 delete mode 100644 app/controllers/github_imports_controller.rb
 create mode 100644 app/controllers/importers/githubs_controller.rb
 create mode 100644 app/controllers/importers/gitlabs_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/github_imports_controller.rb b/app/controllers/github_imports_controller.rb
deleted file mode 100644
index b73e3f7ffac..00000000000
--- a/app/controllers/github_imports_controller.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-class GithubImportsController < ApplicationController
-  before_filter :github_auth, except: :callback
-
-  rescue_from Octokit::Unauthorized, with: :github_unauthorized
-
-  def callback
-    token = client.auth_code.get_token(params[:code]).token
-    current_user.github_access_token = token
-    current_user.save
-    redirect_to status_github_import_url
-  end
-
-  def status
-    @repos = octo_client.repos
-    octo_client.orgs.each do |org|
-      @repos += octo_client.repos(org.login)
-    end
-
-    @already_added_projects = current_user.created_projects.where(import_type: "github")
-    already_added_projects_names = @already_added_projects.pluck(:import_source)
-
-    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
-  end
-
-  def jobs
-    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
-    render json: jobs
-  end
-
-  def create
-    @repo_id = params[:repo_id].to_i
-    repo = octo_client.repo(@repo_id)
-    target_namespace = params[:new_namespace].presence || repo.owner.login
-    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
-
-    if existing_namespace
-      if existing_namespace.owner == current_user
-        namespace = existing_namespace
-      else
-        @already_been_taken = true
-        @target_namespace = target_namespace
-        @project_name = repo.name
-        render and return
-      end
-    else
-      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
-      namespace.add_owner(current_user)
-    end
-
-    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
-  end
-
-  private
-
-  def client
-    @client ||= Gitlab::Github::Client.new.client
-  end
-
-  def octo_client
-    Octokit.auto_paginate = true
-    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
-  end
-
-  def github_auth
-    if current_user.github_access_token.blank?
-      go_to_github_for_permissions
-    end
-  end
-
-  def go_to_github_for_permissions
-    redirect_to client.auth_code.authorize_url({
-      redirect_uri: callback_github_import_url,
-      scope: "repo, user, user:email"
-    })
-  end
-
-  def github_unauthorized
-    go_to_github_for_permissions
-  end
-end
diff --git a/app/controllers/importers/githubs_controller.rb b/app/controllers/importers/githubs_controller.rb
new file mode 100644
index 00000000000..5bb64c4a6ce
--- /dev/null
+++ b/app/controllers/importers/githubs_controller.rb
@@ -0,0 +1,80 @@
+class Importers::GithubsController < ApplicationController
+  before_filter :github_auth, except: :callback
+
+  rescue_from Octokit::Unauthorized, with: :github_unauthorized
+
+  def callback
+    token = client.auth_code.get_token(params[:code]).token
+    current_user.github_access_token = token
+    current_user.save
+    redirect_to status_importers_github_url
+  end
+
+  def status
+    @repos = octo_client.repos
+    octo_client.orgs.each do |org|
+      @repos += octo_client.repos(org.login)
+    end
+
+    @already_added_projects = current_user.created_projects.where(import_type: "github")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id].to_i
+    repo = octo_client.repo(@repo_id)
+    target_namespace = params[:new_namespace].presence || repo.owner.login
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        @target_namespace = target_namespace
+        @project_name = repo.name
+        render and return
+      end
+    else
+      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+    end
+
+    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::Github::Client.new.client
+  end
+
+  def octo_client
+    Octokit.auto_paginate = true
+    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
+  end
+
+  def github_auth
+    if current_user.github_access_token.blank?
+      go_to_github_for_permissions
+    end
+  end
+
+  def go_to_github_for_permissions
+    redirect_to client.auth_code.authorize_url({
+      redirect_uri: callback_importers_github_url,
+      scope: "repo, user, user:email"
+    })
+  end
+
+  def github_unauthorized
+    go_to_github_for_permissions
+  end
+end
diff --git a/app/controllers/importers/gitlabs_controller.rb b/app/controllers/importers/gitlabs_controller.rb
new file mode 100644
index 00000000000..d020c870a4f
--- /dev/null
+++ b/app/controllers/importers/gitlabs_controller.rb
@@ -0,0 +1,69 @@
+class Importers::GitlabsController < ApplicationController
+  before_filter :gitlab_auth, except: :callback
+
+  rescue_from OAuth2::Error, with: :gitlab_unauthorized
+
+  def callback
+    token = client.get_token(params[:code], callback_importers_gitlab_url)
+    current_user.gitlab_access_token = token
+    current_user.save
+    redirect_to status_importers_gitlab_url
+  end
+
+  def status
+    @repos = client.projects
+    
+    @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.to_a.reject!{|repo| already_added_projects_names.include? repo["path_with_namespace"]}
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "gitlab").to_json(:only => [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id].to_i
+    repo = client.project(@repo_id)
+    target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+    
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        @target_namespace = target_namespace
+        @project_name = repo["path"]
+        render and return
+      end
+    else
+      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+    end
+
+    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
+  end
+
+  def gitlab_auth
+    if current_user.gitlab_access_token.blank?
+      go_to_gitlab_for_permissions
+    end
+  end
+
+  def go_to_gitlab_for_permissions
+    redirect_to client.authorize_url(callback_importers_gitlab_url)
+  end
+
+  def gitlab_unauthorized
+    go_to_gitlab_for_permissions
+  end
+end
-- 
cgit v1.2.1


From 18231b0bb353fffa77b492e4b04fa61c9b3a25bb Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 2 Feb 2015 14:26:29 -0800
Subject: GitLab.com integration: refactoring

---
 app/controllers/importers/githubs_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/importers/githubs_controller.rb b/app/controllers/importers/githubs_controller.rb
index 5bb64c4a6ce..b3d42e32dfa 100644
--- a/app/controllers/importers/githubs_controller.rb
+++ b/app/controllers/importers/githubs_controller.rb
@@ -47,13 +47,13 @@ class Importers::GithubsController < ApplicationController
       namespace.add_owner(current_user)
     end
 
-    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
   end
 
   private
 
   def client
-    @client ||= Gitlab::Github::Client.new.client
+    @client ||= Gitlab::GithubImport::Client.new.client
   end
 
   def octo_client
-- 
cgit v1.2.1


From 33349dd54928a0b074b4ae3ebfabf214799fc085 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 2 Feb 2015 17:01:07 -0800
Subject: GitLab.com integration: refactoring

---
 app/controllers/import/github_controller.rb     | 80 +++++++++++++++++++++++++
 app/controllers/import/gitlab_controller.rb     | 69 +++++++++++++++++++++
 app/controllers/importers/githubs_controller.rb | 80 -------------------------
 app/controllers/importers/gitlabs_controller.rb | 69 ---------------------
 4 files changed, 149 insertions(+), 149 deletions(-)
 create mode 100644 app/controllers/import/github_controller.rb
 create mode 100644 app/controllers/import/gitlab_controller.rb
 delete mode 100644 app/controllers/importers/githubs_controller.rb
 delete mode 100644 app/controllers/importers/gitlabs_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
new file mode 100644
index 00000000000..3f0461ead51
--- /dev/null
+++ b/app/controllers/import/github_controller.rb
@@ -0,0 +1,80 @@
+class Import::GithubController < ApplicationController
+  before_filter :github_auth, except: :callback
+
+  rescue_from Octokit::Unauthorized, with: :github_unauthorized
+
+  def callback
+    token = client.auth_code.get_token(params[:code]).token
+    current_user.github_access_token = token
+    current_user.save
+    redirect_to status_import_github_url
+  end
+
+  def status
+    @repos = octo_client.repos
+    octo_client.orgs.each do |org|
+      @repos += octo_client.repos(org.login)
+    end
+
+    @already_added_projects = current_user.created_projects.where(import_type: "github")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id].to_i
+    repo = octo_client.repo(@repo_id)
+    target_namespace = params[:new_namespace].presence || repo.owner.login
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        @target_namespace = target_namespace
+        @project_name = repo.name
+        render and return
+      end
+    else
+      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+    end
+
+    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::GithubImport::Client.new.client
+  end
+
+  def octo_client
+    Octokit.auto_paginate = true
+    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
+  end
+
+  def github_auth
+    if current_user.github_access_token.blank?
+      go_to_github_for_permissions
+    end
+  end
+
+  def go_to_github_for_permissions
+    redirect_to client.auth_code.authorize_url({
+      redirect_uri: callback_import_github_url,
+      scope: "repo, user, user:email"
+    })
+  end
+
+  def github_unauthorized
+    go_to_github_for_permissions
+  end
+end
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
new file mode 100644
index 00000000000..3712af6f024
--- /dev/null
+++ b/app/controllers/import/gitlab_controller.rb
@@ -0,0 +1,69 @@
+class Import::GitlabController < ApplicationController
+  before_filter :gitlab_auth, except: :callback
+
+  rescue_from OAuth2::Error, with: :gitlab_unauthorized
+
+  def callback
+    token = client.get_token(params[:code], callback_import_gitlab_url)
+    current_user.gitlab_access_token = token
+    current_user.save
+    redirect_to status_import_gitlab_url
+  end
+
+  def status
+    @repos = client.projects
+    
+    @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.to_a.reject!{|repo| already_added_projects_names.include? repo["path_with_namespace"]}
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "gitlab").to_json(:only => [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id].to_i
+    repo = client.project(@repo_id)
+    target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+    
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        @target_namespace = target_namespace
+        @project_name = repo["path"]
+        render and return
+      end
+    else
+      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+    end
+
+    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
+  end
+
+  def gitlab_auth
+    if current_user.gitlab_access_token.blank?
+      go_to_gitlab_for_permissions
+    end
+  end
+
+  def go_to_gitlab_for_permissions
+    redirect_to client.authorize_url(callback_import_gitlab_url)
+  end
+
+  def gitlab_unauthorized
+    go_to_gitlab_for_permissions
+  end
+end
diff --git a/app/controllers/importers/githubs_controller.rb b/app/controllers/importers/githubs_controller.rb
deleted file mode 100644
index b3d42e32dfa..00000000000
--- a/app/controllers/importers/githubs_controller.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-class Importers::GithubsController < ApplicationController
-  before_filter :github_auth, except: :callback
-
-  rescue_from Octokit::Unauthorized, with: :github_unauthorized
-
-  def callback
-    token = client.auth_code.get_token(params[:code]).token
-    current_user.github_access_token = token
-    current_user.save
-    redirect_to status_importers_github_url
-  end
-
-  def status
-    @repos = octo_client.repos
-    octo_client.orgs.each do |org|
-      @repos += octo_client.repos(org.login)
-    end
-
-    @already_added_projects = current_user.created_projects.where(import_type: "github")
-    already_added_projects_names = @already_added_projects.pluck(:import_source)
-
-    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
-  end
-
-  def jobs
-    jobs = current_user.created_projects.where(import_type: "github").to_json(only: [:id, :import_status])
-    render json: jobs
-  end
-
-  def create
-    @repo_id = params[:repo_id].to_i
-    repo = octo_client.repo(@repo_id)
-    target_namespace = params[:new_namespace].presence || repo.owner.login
-    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
-
-    if existing_namespace
-      if existing_namespace.owner == current_user
-        namespace = existing_namespace
-      else
-        @already_been_taken = true
-        @target_namespace = target_namespace
-        @project_name = repo.name
-        render and return
-      end
-    else
-      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
-      namespace.add_owner(current_user)
-    end
-
-    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
-  end
-
-  private
-
-  def client
-    @client ||= Gitlab::GithubImport::Client.new.client
-  end
-
-  def octo_client
-    Octokit.auto_paginate = true
-    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
-  end
-
-  def github_auth
-    if current_user.github_access_token.blank?
-      go_to_github_for_permissions
-    end
-  end
-
-  def go_to_github_for_permissions
-    redirect_to client.auth_code.authorize_url({
-      redirect_uri: callback_importers_github_url,
-      scope: "repo, user, user:email"
-    })
-  end
-
-  def github_unauthorized
-    go_to_github_for_permissions
-  end
-end
diff --git a/app/controllers/importers/gitlabs_controller.rb b/app/controllers/importers/gitlabs_controller.rb
deleted file mode 100644
index d020c870a4f..00000000000
--- a/app/controllers/importers/gitlabs_controller.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-class Importers::GitlabsController < ApplicationController
-  before_filter :gitlab_auth, except: :callback
-
-  rescue_from OAuth2::Error, with: :gitlab_unauthorized
-
-  def callback
-    token = client.get_token(params[:code], callback_importers_gitlab_url)
-    current_user.gitlab_access_token = token
-    current_user.save
-    redirect_to status_importers_gitlab_url
-  end
-
-  def status
-    @repos = client.projects
-    
-    @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
-    already_added_projects_names = @already_added_projects.pluck(:import_source)
-
-    @repos.to_a.reject!{|repo| already_added_projects_names.include? repo["path_with_namespace"]}
-  end
-
-  def jobs
-    jobs = current_user.created_projects.where(import_type: "gitlab").to_json(:only => [:id, :import_status])
-    render json: jobs
-  end
-
-  def create
-    @repo_id = params[:repo_id].to_i
-    repo = client.project(@repo_id)
-    target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
-    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
-    
-    if existing_namespace
-      if existing_namespace.owner == current_user
-        namespace = existing_namespace
-      else
-        @already_been_taken = true
-        @target_namespace = target_namespace
-        @project_name = repo["path"]
-        render and return
-      end
-    else
-      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
-      namespace.add_owner(current_user)
-    end
-
-    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
-  end
-
-  private
-
-  def client
-    @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
-  end
-
-  def gitlab_auth
-    if current_user.gitlab_access_token.blank?
-      go_to_gitlab_for_permissions
-    end
-  end
-
-  def go_to_gitlab_for_permissions
-    redirect_to client.authorize_url(callback_importers_gitlab_url)
-  end
-
-  def gitlab_unauthorized
-    go_to_gitlab_for_permissions
-  end
-end
-- 
cgit v1.2.1


From 592ed8738cccd68ced1c2fbf58d0ff16d66e8d14 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 2 Feb 2015 18:25:33 -0800
Subject: Gitlab.com integration: code folding

---
 app/controllers/import/github_controller.rb | 2 +-
 app/controllers/import/gitlab_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 3f0461ead51..08419a37476 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -19,7 +19,7 @@ class Import::GithubController < ApplicationController
     @already_added_projects = current_user.created_projects.where(import_type: "github")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
+    @repos.reject!{ |repo| already_added_projects_names.include? repo.full_name }
   end
 
   def jobs
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index 3712af6f024..448fe6417be 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -16,11 +16,11 @@ class Import::GitlabController < ApplicationController
     @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.to_a.reject!{|repo| already_added_projects_names.include? repo["path_with_namespace"]}
+    @repos.to_a.reject!{ |repo| already_added_projects_names.include? repo["path_with_namespace"] }
   end
 
   def jobs
-    jobs = current_user.created_projects.where(import_type: "gitlab").to_json(:only => [:id, :import_status])
+    jobs = current_user.created_projects.where(import_type: "gitlab").to_json(only: [:id, :import_status])
     render json: jobs
   end
 
-- 
cgit v1.2.1


From 62ed1c537e9b8aa85d354b377f18083fb71b8e05 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 Feb 2015 14:20:55 -0800
Subject: Explicitly define ordering in models using default_scope

---
 app/controllers/admin/dashboard_controller.rb | 6 +++---
 app/controllers/admin/groups_controller.rb    | 2 +-
 app/controllers/admin/users_controller.rb     | 4 ++--
 app/controllers/profiles/keys_controller.rb   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index be19139c9b1..c491e5c7550 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -1,7 +1,7 @@
 class Admin::DashboardController < Admin::ApplicationController
   def index
-    @projects = Project.order("created_at DESC").limit(10)
-    @users = User.order("created_at DESC").limit(10)
-    @groups = Group.order("created_at DESC").limit(10)
+    @projects = Project.limit(10)
+    @users = User.limit(10)
+    @groups = Group.limit(10)
   end
 end
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 8c7d90a5d9f..ae610d4871c 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -2,7 +2,7 @@ class Admin::GroupsController < Admin::ApplicationController
   before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
 
   def index
-    @groups = Group.order('name ASC')
+    @groups = Group.order_name
     @groups = @groups.search(params[:name]) if params[:name].present?
     @groups = @groups.page(params[:page]).per(20)
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index aea8545d38e..932bfc777e6 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -5,13 +5,13 @@ class Admin::UsersController < Admin::ApplicationController
     @users = User.filter(params[:filter])
     @users = @users.search(params[:name]) if params[:name].present?
     @users = @users.sort(@sort = params[:sort])
-    @users = @users.alphabetically.page(params[:page])
+    @users = @users.order_name.page(params[:page])
   end
 
   def show
     @personal_projects = user.personal_projects
     @joined_projects = user.projects.joined(@user)
-    @keys = user.keys.order('id DESC')
+    @keys = user.keys
   end
 
   def new
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 88414b13564..4e2bd0a9b4b 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -3,7 +3,7 @@ class Profiles::KeysController < ApplicationController
   skip_before_filter :authenticate_user!, only: [:get_keys]
 
   def index
-    @keys = current_user.keys.order('id DESC')
+    @keys = current_user.keys
   end
 
   def show
-- 
cgit v1.2.1


From 1ac20698a5122111c8e12de4cc59da837b0f9573 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Thu, 5 Feb 2015 10:31:36 -0800
Subject: gitlab.com importer: refactorig

---
 app/controllers/import/base_controller.rb   | 21 +++++++++++++++++++++
 app/controllers/import/github_controller.rb | 22 +++++-----------------
 app/controllers/import/gitlab_controller.rb | 20 ++++----------------
 3 files changed, 30 insertions(+), 33 deletions(-)
 create mode 100644 app/controllers/import/base_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/import/base_controller.rb b/app/controllers/import/base_controller.rb
new file mode 100644
index 00000000000..4df171dbcfe
--- /dev/null
+++ b/app/controllers/import/base_controller.rb
@@ -0,0 +1,21 @@
+class Import::BaseController < ApplicationController
+
+  private
+
+  def get_or_create_namespace
+    existing_namespace = Namespace.find_by("path = ? OR name = ?", @target_namespace, @target_namespace)
+
+    if existing_namespace
+      if existing_namespace.owner == current_user
+        namespace = existing_namespace
+      else
+        @already_been_taken = true
+        return false
+      end
+    else
+      namespace = Group.create(name: @target_namespace, path: @target_namespace, owner: current_user)
+      namespace.add_owner(current_user)
+      namespace
+    end
+  end
+end
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 08419a37476..108fc4396a6 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,4 +1,4 @@
-class Import::GithubController < ApplicationController
+class Import::GithubController < Import::BaseController
   before_filter :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
@@ -30,22 +30,10 @@ class Import::GithubController < ApplicationController
   def create
     @repo_id = params[:repo_id].to_i
     repo = octo_client.repo(@repo_id)
-    target_namespace = params[:new_namespace].presence || repo.owner.login
-    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
-
-    if existing_namespace
-      if existing_namespace.owner == current_user
-        namespace = existing_namespace
-      else
-        @already_been_taken = true
-        @target_namespace = target_namespace
-        @project_name = repo.name
-        render and return
-      end
-    else
-      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
-      namespace.add_owner(current_user)
-    end
+    @target_namespace = params[:new_namespace].presence || repo.owner.login
+    @project_name = repo.name
+    
+    namespace = get_or_create_namespace || (render and return)
 
     @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
   end
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index 448fe6417be..a51ea36aff8 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -1,4 +1,4 @@
-class Import::GitlabController < ApplicationController
+class Import::GitlabController < Import::BaseController
   before_filter :gitlab_auth, except: :callback
 
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
@@ -27,22 +27,10 @@ class Import::GitlabController < ApplicationController
   def create
     @repo_id = params[:repo_id].to_i
     repo = client.project(@repo_id)
-    target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
-    existing_namespace = Namespace.find_by("path = ? OR name = ?", target_namespace, target_namespace)
+    @target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
+    @project_name = repo["name"]
     
-    if existing_namespace
-      if existing_namespace.owner == current_user
-        namespace = existing_namespace
-      else
-        @already_been_taken = true
-        @target_namespace = target_namespace
-        @project_name = repo["path"]
-        render and return
-      end
-    else
-      namespace = Group.create(name: target_namespace, path: target_namespace, owner: current_user)
-      namespace.add_owner(current_user)
-    end
+    namespace = get_or_create_namespace || (render and return)
 
     @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
   end
-- 
cgit v1.2.1


From bbca6a0abd9f5559fe4abbf2cb2100a0e4717ac8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 Feb 2015 19:15:05 -0800
Subject: Refactor sorting in project

---
 app/controllers/admin/groups_controller.rb | 3 ++-
 app/controllers/admin/users_controller.rb  | 4 ++--
 app/controllers/application_controller.rb  | 4 ++--
 app/controllers/dashboard_controller.rb    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index ae610d4871c..65dc027c8eb 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -2,7 +2,8 @@ class Admin::GroupsController < Admin::ApplicationController
   before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
 
   def index
-    @groups = Group.order_name
+    @groups = Group.all
+    @groups = @groups.sort(@sort = params[:sort])
     @groups = @groups.search(params[:name]) if params[:name].present?
     @groups = @groups.page(params[:page]).per(20)
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 932bfc777e6..e5d15528d78 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -2,10 +2,10 @@ class Admin::UsersController < Admin::ApplicationController
   before_filter :user, only: [:show, :edit, :update, :destroy]
 
   def index
-    @users = User.filter(params[:filter])
+    @users = User.order_name_asc.filter(params[:filter])
     @users = @users.search(params[:name]) if params[:name].present?
     @users = @users.sort(@sort = params[:sort])
-    @users = @users.order_name.page(params[:page])
+    @users = @users.page(params[:page])
   end
 
   def show
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 36e13706768..6553027b430 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -254,7 +254,7 @@ class ApplicationController < ActionController::Base
   end
 
   def set_filters_params
-    params[:sort] ||= 'newest'
+    params[:sort] ||= 'created_desc'
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
 
@@ -280,7 +280,7 @@ class ApplicationController < ActionController::Base
     author_id = @filter_params[:author_id]
     milestone_id = @filter_params[:milestone_id]
 
-    @sort = @filter_params[:sort].try(:humanize)
+    @sort = @filter_params[:sort]
     @assignees = User.where(id: collection.pluck(:assignee_id))
     @authors = User.where(id: collection.pluck(:author_id))
     @milestones = Milestone.where(id: collection.pluck(:milestone_id))
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index cd876024ba3..9e59264e418 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -9,7 +9,7 @@ class DashboardController < ApplicationController
     # If user needs more - point to Dashboard#projects page
     @projects_limit = 30
 
-    @groups = current_user.authorized_groups.sort_by(&:human_name)
+    @groups = current_user.authorized_groups.order_name_asc
     @has_authorized_projects = @projects.count > 0
     @projects_count = @projects.count
     @projects = @projects.limit(@projects_limit)
-- 
cgit v1.2.1


From 8952fc015fae476a20051c01cf4217d82d30c83d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 Feb 2015 20:29:41 -0800
Subject: Apply default scope to labels and remove one for notes

---
 app/controllers/projects/commits_controller.rb        | 2 +-
 app/controllers/projects/labels_controller.rb         | 2 +-
 app/controllers/projects/merge_requests_controller.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 0a85c36a758..b133afe44b5 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -13,7 +13,7 @@ class Projects::CommitsController < Projects::ApplicationController
 
     @commits = @repo.commits(@ref, @path, @limit, @offset)
     @note_counts = Note.where(commit_id: @commits.map(&:id)).
-        group(:commit_id).count
+      group(:commit_id).count
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 6c7bde9c5d5..b61fef3b627 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController
   respond_to :js, :html
 
   def index
-    @labels = @project.labels.order_by_name.page(params[:page]).per(20)
+    @labels = @project.labels.page(params[:page]).per(20)
   end
 
   def new
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 912f9eb5b6b..01be318ede2 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -23,7 +23,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def show
     @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
-        group(:commit_id).count
+      group(:commit_id).count
 
     respond_to do |format|
       format.html
-- 
cgit v1.2.1


From b3c90dd51418d0c41df4ccd57d9480ea44b35eec Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Thu, 5 Feb 2015 16:57:27 -0800
Subject: GitHub importer refactoring

---
 app/controllers/import/github_controller.rb | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 108fc4396a6..c869c7c86f3 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -4,16 +4,16 @@ class Import::GithubController < Import::BaseController
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
 
   def callback
-    token = client.auth_code.get_token(params[:code]).token
+    token = client.get_token(params[:code])
     current_user.github_access_token = token
     current_user.save
     redirect_to status_import_github_url
   end
 
   def status
-    @repos = octo_client.repos
-    octo_client.orgs.each do |org|
-      @repos += octo_client.repos(org.login)
+    @repos = client.repos
+    client.orgs.each do |org|
+      @repos += client.repos(org.login)
     end
 
     @already_added_projects = current_user.created_projects.where(import_type: "github")
@@ -29,7 +29,7 @@ class Import::GithubController < Import::BaseController
 
   def create
     @repo_id = params[:repo_id].to_i
-    repo = octo_client.repo(@repo_id)
+    repo = client.repo(@repo_id)
     @target_namespace = params[:new_namespace].presence || repo.owner.login
     @project_name = repo.name
     
@@ -41,12 +41,7 @@ class Import::GithubController < Import::BaseController
   private
 
   def client
-    @client ||= Gitlab::GithubImport::Client.new.client
-  end
-
-  def octo_client
-    Octokit.auto_paginate = true
-    @octo_client ||= Octokit::Client.new(access_token: current_user.github_access_token)
+    @client ||= Gitlab::GithubImport::Client.new(current_user.github_access_token)
   end
 
   def github_auth
@@ -56,10 +51,7 @@ class Import::GithubController < Import::BaseController
   end
 
   def go_to_github_for_permissions
-    redirect_to client.auth_code.authorize_url({
-      redirect_uri: callback_import_github_url,
-      scope: "repo, user, user:email"
-    })
+    redirect_to client.authorize_url(callback_import_github_url)
   end
 
   def github_unauthorized
-- 
cgit v1.2.1


From 9dbd7e5aec921e43f3ea89c8e3357ca0174b0937 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sat, 7 Feb 2015 00:23:58 +0100
Subject: Allow notification email to be set separately from primary email.

Closes #1932.
---
 app/controllers/admin/users_controller.rb          |  3 +++
 app/controllers/profiles/emails_controller.rb      |  3 +++
 .../profiles/notifications_controller.rb           | 22 ++++++++++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index aea8545d38e..b4c78814a19 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -102,6 +102,9 @@ class Admin::UsersController < Admin::ApplicationController
     email = user.emails.find(params[:email_id])
     email.destroy
 
+    user.set_notification_email
+    user.save if user.notification_email_changed?
+
     respond_to do |format|
       format.html { redirect_to :back, notice: "Successfully removed email." }
       format.js { render nothing: true }
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index f3f0e69b83a..4a65c978e5c 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -18,6 +18,9 @@ class Profiles::EmailsController < ApplicationController
     @email = current_user.emails.find(params[:id])
     @email.destroy
 
+    current_user.set_notification_email
+    current_user.save if current_user.notification_email_changed?
+
     respond_to do |format|
       format.html { redirect_to profile_emails_url }
       format.js { render nothing: true }
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 638d1f9789b..433c19189af 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -2,6 +2,7 @@ class Profiles::NotificationsController < ApplicationController
   layout 'profile'
 
   def show
+    @user = current_user
     @notification = current_user.notification
     @project_members = current_user.project_members
     @group_members = current_user.group_members
@@ -11,8 +12,7 @@ class Profiles::NotificationsController < ApplicationController
     type = params[:notification_type]
 
     @saved = if type == 'global'
-               current_user.notification_level = params[:notification_level]
-               current_user.save
+               current_user.update_attributes(user_params)
              elsif type == 'group'
                users_group = current_user.group_members.find(params[:notification_id])
                users_group.notification_level = params[:notification_level]
@@ -22,5 +22,23 @@ class Profiles::NotificationsController < ApplicationController
                project_member.notification_level = params[:notification_level]
                project_member.save
              end
+
+    respond_to do |format|
+      format.html do
+        if @saved
+          flash[:notice] = "Notification settings saved"
+        else
+          flash[:alert] = "Failed to save new settings"
+        end
+
+        redirect_to :back
+      end
+
+      format.js
+    end
+  end
+
+  def user_params
+    params.require(:user).permit(:notification_email, :notification_level)
   end
 end
-- 
cgit v1.2.1


From 03c8bf39e10b52bc5e9f128fe53876ad8b398dac Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 8 Feb 2015 00:53:31 -0800
Subject: When add new social account - redirect to accounts page and show
 notice message

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

(limited to 'app/controllers')

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 442a1cf7518..bb9d65c9ed6 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -44,7 +44,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     if current_user
       # Add new authentication method
       current_user.identities.find_or_create_by(extern_uid: oauth['uid'], provider: oauth['provider'])
-      redirect_to profile_path
+      redirect_to profile_account_path, notice: 'Authentication method updated'
     else
       @user = Gitlab::OAuth::User.new(oauth)
       @user.save
-- 
cgit v1.2.1


From 6b4ddf2cc13eda5dd6df64bab6f95f88d64cd2fa Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 11 Feb 2015 17:34:41 -0800
Subject: Add admin services templates.

---
 app/controllers/admin/services_controller.rb | 51 ++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 app/controllers/admin/services_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
new file mode 100644
index 00000000000..5697e1a5492
--- /dev/null
+++ b/app/controllers/admin/services_controller.rb
@@ -0,0 +1,51 @@
+class Admin::ServicesController < Admin::ApplicationController
+  before_filter :service, only: [:edit, :update]
+
+  def index
+    @services = services_templates
+  end
+
+  def edit
+    unless service.present?
+      redirect_to admin_application_settings_services_path,
+        alert: "Service is unknown or it doesn't exist"
+    end
+  end
+
+  def update
+    if service.update_attributes(application_services_params[:service])
+      redirect_to admin_application_settings_services_path,
+        notice: 'Application settings saved successfully'
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def services_templates
+    templates = []
+
+    allowed_templates.each do |service|
+      service_template = service.constantize
+      templates << service_template.where(template: true).first_or_create
+    end
+
+    templates
+  end
+
+  def allowed_templates
+    %w( JiraService RedmineService CustomIssueTrackerService )
+  end
+
+  def service
+    @service ||= Service.where(id: params[:id], template: true).first
+  end
+
+  def application_services_params
+    params.permit(:id,
+      service: [
+        :title, :project_url, :description, :issues_url, :new_issue_url
+    ])
+  end
+end
-- 
cgit v1.2.1


From 9f33898f7aa9c2269aef8aad6cbd9075ab2efd3e Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 12 Feb 2015 09:19:55 -0800
Subject: All services can have templates.

---
 app/controllers/admin/services_controller.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 5697e1a5492..554a7d83d9f 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -26,18 +26,14 @@ class Admin::ServicesController < Admin::ApplicationController
   def services_templates
     templates = []
 
-    allowed_templates.each do |service|
-      service_template = service.constantize
+    Service.available_services_names.each do |service|
+      service_template = service.concat("_service").camelize.constantize
       templates << service_template.where(template: true).first_or_create
     end
 
     templates
   end
 
-  def allowed_templates
-    %w( JiraService RedmineService CustomIssueTrackerService )
-  end
-
   def service
     @service ||= Service.where(id: params[:id], template: true).first
   end
@@ -45,7 +41,11 @@ class Admin::ServicesController < Admin::ApplicationController
   def application_services_params
     params.permit(:id,
       service: [
-        :title, :project_url, :description, :issues_url, :new_issue_url
+        :title, :token, :type, :active, :api_key, :subdomain,
+        :room, :recipients, :project_url, :webhook,
+        :user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
+        :build_key, :server, :teamcity_url, :build_type,
+        :description, :issues_url, :new_issue_url, :restrict_to_branch
     ])
   end
 end
-- 
cgit v1.2.1


From e8271226b1a474f097909b8006d78dd60bbca7be Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 12 Feb 2015 10:57:08 -0800
Subject: Use the service_name.

---
 app/controllers/admin/services_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 554a7d83d9f..e80cabd6e18 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -26,8 +26,8 @@ class Admin::ServicesController < Admin::ApplicationController
   def services_templates
     templates = []
 
-    Service.available_services_names.each do |service|
-      service_template = service.concat("_service").camelize.constantize
+    Service.available_services_names.each do |service_name|
+      service_template = service_name.concat("_service").camelize.constantize
       templates << service_template.where(template: true).first_or_create
     end
 
-- 
cgit v1.2.1


From 1a89db5ffbca432c14eae9d364debc5b87b4635e Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 12 Feb 2015 13:02:58 -0800
Subject: Try to test settings added in the service.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index b3110eacc18..2b3e70f7bdb 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -29,7 +29,7 @@ class Projects::ServicesController < Projects::ApplicationController
     if @service.execute(data)
       message = { notice: 'We sent a request to the provided URL' }
     else
-      message = { alert: 'We tried to send a request to the provided URL but error occured' }
+      message = { alert: 'We tried to send a request to the provided URL but an error occured' }
     end
 
     redirect_to :back, message
-- 
cgit v1.2.1


From 07d05d2df7d1b79406232e91a7354e0c7fd1877a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Feb 2015 11:57:56 +0100
Subject: Move all event creation to EventCreateService.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 64b820160d3..22eb8f67f9a 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -27,7 +27,7 @@ class Projects::TagsController < Projects::ApplicationController
     tag = @repository.find_tag(params[:id])
 
     if tag && @repository.rm_tag(tag.name)
-      Event.create_ref_event(@project, current_user, tag, 'rm', 'refs/tags')
+      EventCreateService.new.push_ref(@project, current_user, tag, 'rm', 'refs/tags')
     end
 
     respond_to do |format|
-- 
cgit v1.2.1


From ce08f919bfab73178b2f8c584f34fd8849834365 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Feb 2015 12:02:17 +0100
Subject: Add link to share via twitter to "created project" event.

---
 app/controllers/admin/application_settings_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 7458542fc73..2b0c500e97a 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -26,6 +26,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :signup_enabled,
       :signin_enabled,
       :gravatar_enabled,
+      :twitter_sharing_enabled,
       :sign_in_text,
       :home_page_url
     )
-- 
cgit v1.2.1


From 34cc4c598232d2e27dcc99f5534dbe318e89cff9 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Feb 2015 14:31:42 +0100
Subject: Link head panel titles to relevant root page.

---
 app/controllers/snippets_controller.rb | 1 +
 app/controllers/users_controller.rb    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 1ed3bc388fb..6ac048e4b83 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -106,6 +106,7 @@ class SnippetsController < ApplicationController
 
   def set_title
     @title = 'Snippets'
+    @title_url = snippets_path
   end
 
   def snippet_params
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 57d8ef09faf..84a04c5ebe6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,6 +19,7 @@ class UsersController < ApplicationController
       where(project_id: authorized_projects_ids).limit(30)
 
     @title = @user.name
+    @title_url = user_path(@user)
 
     respond_to do |format|
       format.html
-- 
cgit v1.2.1


From 25e44d05300a6b5b35232b27b4ccb27f47f09a67 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Feb 2015 13:33:28 +0100
Subject: Allow users that signed up via OAuth to set their password in order
 to use Git over HTTP(S).

---
 app/controllers/admin/users_controller.rb        | 2 +-
 app/controllers/profiles/passwords_controller.rb | 8 +++++---
 app/controllers/profiles_controller.rb           | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 232f30b759d..ecedb31a7f8 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -121,7 +121,7 @@ class Admin::UsersController < Admin::ApplicationController
     params.require(:user).permit(
       :email, :remember_me, :bio, :name, :username,
       :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, :force_random_password,
-      :extern_uid, :provider, :password_expires_at, :avatar, :hide_no_ssh_key,
+      :extern_uid, :provider, :password_expires_at, :avatar, :hide_no_ssh_key, :hide_no_password,
       :projects_limit, :can_create_group, :admin, :key_id
     )
   end
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 1191ce47eba..0c614969a3f 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -11,7 +11,7 @@ class Profiles::PasswordsController < ApplicationController
   end
 
   def create
-    unless @user.valid_password?(user_params[:current_password])
+    unless @user.password_automatically_set || @user.valid_password?(user_params[:current_password])
       redirect_to new_profile_password_path, alert: 'You must provide a valid current password'
       return
     end
@@ -21,7 +21,8 @@ class Profiles::PasswordsController < ApplicationController
 
     result = @user.update_attributes(
       password: new_password,
-      password_confirmation: new_password_confirmation
+      password_confirmation: new_password_confirmation,
+      password_automatically_set: false
     )
 
     if result
@@ -39,8 +40,9 @@ class Profiles::PasswordsController < ApplicationController
     password_attributes = user_params.select do |key, value|
       %w(password password_confirmation).include?(key.to_s)
     end
+    password_attributes[:password_automatically_set] = false
 
-    unless @user.valid_password?(user_params[:current_password])
+    unless @user.password_automatically_set || @user.valid_password?(user_params[:current_password])
       redirect_to edit_profile_password_path, alert: 'You must provide a valid current password'
       return
     end
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index c0b7e2223a2..f7584c03411 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -67,7 +67,7 @@ class ProfilesController < ApplicationController
     params.require(:user).permit(
       :email, :password, :password_confirmation, :bio, :name, :username,
       :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id,
-      :avatar, :hide_no_ssh_key,
+      :avatar, :hide_no_ssh_key, :hide_no_password
     )
   end
 end
-- 
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/admin/projects_controller.rb       |  7 +++++--
 app/controllers/application_controller.rb          |  6 ++++--
 app/controllers/projects/application_controller.rb |  8 ++++++--
 app/controllers/projects/avatars_controller.rb     |  2 +-
 app/controllers/projects/blob_controller.rb        | 11 ++++++-----
 app/controllers/projects/branches_controller.rb    |  8 ++++++--
 app/controllers/projects/compare_controller.rb     |  3 ++-
 app/controllers/projects/deploy_keys_controller.rb |  9 ++++++---
 app/controllers/projects/forks_controller.rb       |  7 +++++--
 app/controllers/projects/hooks_controller.rb       |  4 ++--
 app/controllers/projects/imports_controller.rb     | 10 ++++++----
 app/controllers/projects/issues_controller.rb      |  8 +++++---
 app/controllers/projects/labels_controller.rb      | 16 +++++++++------
 .../projects/merge_requests_controller.rb          | 11 +++++++++--
 app/controllers/projects/milestones_controller.rb  |  5 +++--
 .../projects/protected_branches_controller.rb      |  5 +++--
 app/controllers/projects/refs_controller.rb        | 10 ++++++----
 .../projects/repositories_controller.rb            |  2 +-
 app/controllers/projects/services_controller.rb    |  7 +++++--
 app/controllers/projects/snippets_controller.rb    |  7 ++++---
 app/controllers/projects/tags_controller.rb        |  4 ++--
 .../projects/team_members_controller.rb            | 13 ++++++++----
 app/controllers/projects/tree_controller.rb        |  5 ++++-
 app/controllers/projects/wikis_controller.rb       | 17 ++++++++++++----
 app/controllers/projects_controller.rb             | 23 +++++++++++++++-------
 25 files changed, 139 insertions(+), 69 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 7c2388e81be..2b1fc862b7f 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -25,13 +25,16 @@ class Admin::ProjectsController < Admin::ApplicationController
   def transfer
     ::Projects::TransferService.new(@project, current_user, params.dup).execute
 
-    redirect_to [:admin, @project.reload]
+    @project.reload
+    redirect_to admin_namespace_project_path(@project.namespace, @project)
   end
 
   protected
 
   def project
-    @project = Project.find_with_namespace(params[:id])
+    @project = Project.find_with_namespace(
+      [params[:namespace_id], '/', params[:id]].join('')
+    )
     @project || render_404
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6553027b430..eb3be08df56 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -93,6 +93,7 @@ class ApplicationController < ActionController::Base
 
   def project
     unless @project
+      namespace = params[:namespace_id]
       id = params[:project_id] || params[:id]
 
       # Redirect from
@@ -104,7 +105,7 @@ class ApplicationController < ActionController::Base
         redirect_to request.original_url.gsub(/\.git\Z/, '') and return
       end
 
-      @project = Project.find_with_namespace(id)
+      @project = Project.find_with_namespace("#{namespace}/#{id}")
 
       if @project and can?(current_user, :read_project, @project)
         @project
@@ -121,7 +122,8 @@ class ApplicationController < ActionController::Base
 
   def repository
     @repository ||= project.repository
-  rescue Grit::NoSuchPathError
+  rescue Grit::NoSuchPathError(e)
+    log_exception(e)
     nil
   end
 
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 7e4580017dd..4719933394f 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -8,7 +8,8 @@ class Projects::ApplicationController < ApplicationController
     # for non-signed users
     if !current_user
       id = params[:project_id] || params[:id]
-      @project = Project.find_with_namespace(id)
+      project_with_namespace = "#{params[:namespace_id]}/#{id}"
+      @project = Project.find_with_namespace(project_with_namespace)
 
       return if @project && @project.public?
     end
@@ -26,7 +27,10 @@ class Projects::ApplicationController < ApplicationController
 
   def require_branch_head
     unless @repository.branch_names.include?(@ref)
-      redirect_to project_tree_path(@project, @ref), notice: "This action is not allowed unless you are on top of a branch"
+      redirect_to(
+        namespace_project_tree_path(@project.namespace, @project, @ref),
+        notice: "This action is not allowed unless you are on top of a branch"
+      )
     end
   end
 end
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
index a482b90880d..b90a95c3aab 100644
--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -24,6 +24,6 @@ class Projects::AvatarsController < Projects::ApplicationController
     @project.save
     @project.reset_events_cache
 
-    redirect_to edit_project_path(@project)
+    redirect_to edit_namespace_project_path(@project.namespace, @project)
   end
 end
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index dccb96ba1d1..cc42b1512dc 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -25,7 +25,7 @@ class Projects::BlobController < Projects::ApplicationController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to project_blob_path(@project, File.join(@ref, file_path))
+      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@ref, file_path))
     else
       flash[:alert] = result[:message]
       render :new
@@ -70,7 +70,8 @@ class Projects::BlobController < Projects::ApplicationController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to project_tree_path(@project, @ref)
+      redirect_to namespace_project_tree_path(@project.namespace, @project,
+                                              @ref)
     else
       flash[:alert] = result[:message]
       render :show
@@ -102,7 +103,7 @@ class Projects::BlobController < Projects::ApplicationController
     else
       if tree = @repository.tree(@commit.id, @path)
         if tree.entries.any?
-          redirect_to project_tree_path(@project, File.join(@ref, @path)) and return
+          redirect_to namespace_project_tree_path(@project.namespace, @project, File.join(@ref, @path)) and return
         end
       end
 
@@ -128,10 +129,10 @@ class Projects::BlobController < Projects::ApplicationController
   def after_edit_path
     @after_edit_path ||=
       if from_merge_request
-        diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request) +
+        diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
           "#file-path-#{hexdigest(@path)}"
       else
-        project_blob_path(@project, @id)
+        namespace_project_blob_path(@project.namespace, @project, @id)
       end
   end
 
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index cff1a907dc2..4d002aba972 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -24,7 +24,8 @@ class Projects::BranchesController < Projects::ApplicationController
 
     if result[:status] == :success
       @branch = result[:branch]
-      redirect_to project_tree_path(@project, @branch.name)
+      redirect_to namespace_project_tree_path(@project.namespace, @project,
+                                              @branch.name)
     else
       @error = result[:message]
       render action: 'new'
@@ -36,7 +37,10 @@ class Projects::BranchesController < Projects::ApplicationController
     @branch_name = params[:id]
 
     respond_to do |format|
-      format.html { redirect_to project_branches_path(@project) }
+      format.html do
+        redirect_to namespace_project_branches_path(@project.namespace,
+                                                    @project)
+      end
       format.js
     end
   end
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index ffb8c2e4af1..0e12bbdc49f 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -25,6 +25,7 @@ class Projects::CompareController < Projects::ApplicationController
   end
 
   def create
-    redirect_to project_compare_path(@project, params[:from], params[:to])
+    redirect_to namespace_project_compare_path(@project.namespace, @project,
+                                               params[:from], params[:to])
   end
 end
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 024b9520d30..b7cc305899c 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -25,7 +25,8 @@ class Projects::DeployKeysController < Projects::ApplicationController
     @key = DeployKey.new(deploy_key_params)
 
     if @key.valid? && @project.deploy_keys << @key
-      redirect_to project_deploy_keys_path(@project)
+      redirect_to namespace_project_deploy_keys_path(@project.namespace,
+                                                     @project)
     else
       render "new"
     end
@@ -44,13 +45,15 @@ class Projects::DeployKeysController < Projects::ApplicationController
   def enable
     @project.deploy_keys << available_keys.find(params[:id])
 
-    redirect_to project_deploy_keys_path(@project)
+    redirect_to namespace_project_deploy_keys_path(@project.namespace,
+                                                   @project)
   end
 
   def disable
     @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
 
-    redirect_to project_deploy_keys_path(@project)
+    redirect_to namespace_project_deploy_keys_path(@project.namespace,
+                                                   @project)
   end
 
   protected
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index a0481d11582..72f73bedf54 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@@ -9,11 +9,14 @@ class Projects::ForksController < Projects::ApplicationController
   end
 
   def create
-    namespace = Namespace.find(params[:namespace_id])
+    namespace = Namespace.find(params[:namespace_key])
     @forked_project = ::Projects::ForkService.new(project, current_user, namespace: namespace).execute
 
     if @forked_project.saved? && @forked_project.forked?
-      redirect_to(@forked_project, notice: 'Project was successfully forked.')
+      redirect_to(
+        namespace_project_path(@forked_project.namespace, @forked_project),
+        notice: 'Project was successfully forked.'
+      )
     else
       @title = 'Fork project'
       render :error
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 2d6c3111192..ba95bb13e1f 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -16,7 +16,7 @@ class Projects::HooksController < Projects::ApplicationController
     @hook.save
 
     if @hook.valid?
-      redirect_to project_hooks_path(@project)
+      redirect_to namespace_project_hooks_path(@project.namespace, @project)
     else
       @hooks = @project.hooks.select(&:persisted?)
       render :index
@@ -43,7 +43,7 @@ class Projects::HooksController < Projects::ApplicationController
   def destroy
     hook.destroy
 
-    redirect_to project_hooks_path(@project)
+    redirect_to namespace_project_hooks_path(@project.namespace, @project)
   end
 
   private
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index b8350642804..e2f957a640c 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -20,7 +20,7 @@ class Projects::ImportsController < Projects::ApplicationController
       end
     end
 
-    redirect_to project_import_path(@project)
+    redirect_to namespace_project_import_path(@project.namespace, @project)
   end
 
   def show
@@ -28,7 +28,8 @@ class Projects::ImportsController < Projects::ApplicationController
       if @project.import_finished?
         redirect_to(@project) and return
       else
-        redirect_to new_project_import_path(@project) and return
+        redirect_to new_namespace_project_import_path(@project.namespace,
+                                                      @project) && return
       end
     end
   end
@@ -37,13 +38,14 @@ class Projects::ImportsController < Projects::ApplicationController
 
   def require_no_repo
     if @project.repository_exists?
-      redirect_to(@project) and return
+      redirect_to(namespace_project_path(@project.namespace, @project)) and return
     end
   end
 
   def redirect_if_progress
     if @project.import_in_progress?
-      redirect_to project_import_path(@project) and return
+      redirect_to namespace_project_import_path(@project.namespace, @project) &&
+        return
     end
   end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 42e207cf376..d1bf842ec1a 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -60,7 +60,8 @@ class Projects::IssuesController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         if @issue.valid?
-          redirect_to project_issue_path(@project, @issue)
+          redirect_to namespace_project_issue_path(@project.namespace,
+                                                   @project, @issue)
         else
           render :new
         end
@@ -78,7 +79,7 @@ class Projects::IssuesController < Projects::ApplicationController
       format.js
       format.html do
         if @issue.valid?
-          redirect_to [@project, @issue]
+          redirect_to [@project.namespace, @project, @issue]
         else
           render :edit
         end
@@ -128,7 +129,8 @@ class Projects::IssuesController < Projects::ApplicationController
     issue = @project.issues.find_by(id: params[:id])
 
     if issue
-      redirect_to project_issue_path(@project, issue)
+      redirect_to namespace_project_issue_path(@project.namespace, @project,
+                                               issue)
       return
     else
       raise ActiveRecord::RecordNotFound.new
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index b61fef3b627..5e31fce4b0e 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -18,7 +18,7 @@ class Projects::LabelsController < Projects::ApplicationController
     @label = @project.labels.create(label_params)
 
     if @label.valid?
-      redirect_to project_labels_path(@project)
+      redirect_to namespace_project_labels_path(@project.namespace, @project)
     else
       render 'new'
     end
@@ -29,7 +29,7 @@ class Projects::LabelsController < Projects::ApplicationController
 
   def update
     if @label.update_attributes(label_params)
-      redirect_to project_labels_path(@project)
+      redirect_to namespace_project_labels_path(@project.namespace, @project)
     else
       render 'edit'
     end
@@ -39,11 +39,12 @@ class Projects::LabelsController < Projects::ApplicationController
     Gitlab::IssuesLabels.generate(@project)
 
     if params[:redirect] == 'issues'
-      redirect_to project_issues_path(@project)
+      redirect_to namespace_project_issues_path(@project.namespace, @project)
     elsif params[:redirect] == 'merge_requests'
-      redirect_to project_merge_requests_path(@project)
+      redirect_to namespace_project_merge_requests_path(@project.namespace,
+                                                        @project)
     else
-      redirect_to project_labels_path(@project)
+      redirect_to namespace_project_labels_path(@project.namespace, @project)
     end
   end
 
@@ -51,7 +52,10 @@ class Projects::LabelsController < Projects::ApplicationController
     @label.destroy
 
     respond_to do |format|
-      format.html { redirect_to project_labels_path(@project), notice: 'Label was removed' }
+      format.html do
+        redirect_to(namespace_project_labels_path(@project.namespace, @project),
+                    notice: 'Label was removed')
+      end
       format.js
     end
   end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 01be318ede2..98e4775e409 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -78,7 +78,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
 
     if @merge_request.valid?
-      redirect_to project_merge_request_path(@merge_request.target_project, @merge_request), notice: 'Merge request was successfully created.'
+      redirect_to(
+        namespace_project_merge_request_path(@merge_request.target_project.namespace,
+                                             @merge_request.target_project,
+                                             @merge_request),
+        notice: 'Merge request was successfully created.'
+      )
     else
       @source_project = @merge_request.source_project
       @target_project = @merge_request.target_project
@@ -93,7 +98,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       respond_to do |format|
         format.js
         format.html do
-          redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully updated.'
+          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
+                       @merge_request.target_project, @merge_request],
+                      notice: 'Merge request was successfully updated.')
         end
       end
     else
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index 95801f8b8fb..97eaabb15c3 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -40,7 +40,8 @@ class Projects::MilestonesController < Projects::ApplicationController
     @milestone = Milestones::CreateService.new(project, current_user, milestone_params).execute
 
     if @milestone.save
-      redirect_to project_milestone_path(@project, @milestone)
+      redirect_to namespace_project_milestone_path(@project.namespace,
+                                                   @project, @milestone)
     else
       render "new"
     end
@@ -67,7 +68,7 @@ class Projects::MilestonesController < Projects::ApplicationController
     @milestone.destroy
 
     respond_to do |format|
-      format.html { redirect_to project_milestones_path }
+      format.html { redirect_to namespace_project_milestones_path }
       format.js { render nothing: true }
     end
   end
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index f45df38b87c..ac36ac6fcd3 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -12,7 +12,8 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
 
   def create
     @project.protected_branches.create(protected_branch_params)
-    redirect_to project_protected_branches_path(@project)
+    redirect_to namespace_project_protected_branches_path(@project.namespace,
+                                                          @project)
   end
 
   def update
@@ -37,7 +38,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
     @project.protected_branches.find(params[:id]).destroy
 
     respond_to do |format|
-      format.html { redirect_to project_protected_branches_path }
+      format.html { redirect_to namespace_project_protected_branches_path }
       format.js { render nothing: true }
     end
   end
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index b80472f8eb4..ec41cafda4d 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -9,13 +9,15 @@ class Projects::RefsController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         new_path = if params[:destination] == "tree"
-                     project_tree_path(@project, (@id))
+                     namespace_project_tree_path(@project.namespace, @project,
+                                                 (@id))
                    elsif params[:destination] == "blob"
-                     project_blob_path(@project, (@id))
+                     namespace_project_blob_path(@project.namespace, @project,
+                                                 (@id))
                    elsif params[:destination] == "graph"
-                     project_network_path(@project, @id, @options)
+                     namespace_project_network_path(@project.namespace, @project, @id, @options)
                    else
-                     project_commits_path(@project, @id)
+                     namespace_project_commits_path(@project.namespace, @project, @id)
                    end
 
         redirect_to new_path
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 3a90c1c806d..8a997370dd7 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -7,7 +7,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
   def create
     @project.create_repository
 
-    redirect_to @project
+    redirect_to namespace_project_path(@project.namespace, @project)
   end
 
   def archive
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 2b3e70f7bdb..5c29a6550f5 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -17,8 +17,11 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
-      redirect_to edit_project_service_path(@project, @service.to_param),
-       notice: 'Successfully updated.'
+      redirect_to(
+        edit_namespace_project_service_path(@project.namespace, @project,
+                                            @service.to_param, notice:
+                                            'Successfully updated.')
+      )
     else
       render 'edit'
     end
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 25c887deafa..6c250e4ffed 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -32,7 +32,8 @@ class Projects::SnippetsController < Projects::ApplicationController
     @snippet.author = current_user
 
     if @snippet.save
-      redirect_to project_snippet_path(@project, @snippet)
+      redirect_to namespace_project_snippet_path(@project.namespace, @project,
+                                                 @snippet)
     else
       respond_with(@snippet)
     end
@@ -43,7 +44,7 @@ class Projects::SnippetsController < Projects::ApplicationController
 
   def update
     if @snippet.update_attributes(snippet_params)
-      redirect_to project_snippet_path(@project, @snippet)
+      redirect_to namespace_project_snippet_path(@project.namespace, @project, @snippet)
     else
       respond_with(@snippet)
     end
@@ -60,7 +61,7 @@ class Projects::SnippetsController < Projects::ApplicationController
 
     @snippet.destroy
 
-    redirect_to project_snippets_path(@project)
+    redirect_to namespace_project_snippets_path(@project.namespace, @project)
   end
 
   def raw
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 64b820160d3..dafbb4d51ea 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -16,7 +16,7 @@ class Projects::TagsController < Projects::ApplicationController
 
     if result[:status] == :success
       @tag = result[:tag]
-      redirect_to project_tags_path(@project)
+      redirect_to namespace_project_tags_path(@project.namespace, @project)
     else
       @error = result[:message]
       render action: 'new'
@@ -31,7 +31,7 @@ class Projects::TagsController < Projects::ApplicationController
     end
 
     respond_to do |format|
-      format.html { redirect_to project_tags_path }
+      format.html { redirect_to namespace_project_tags_path }
       format.js
     end
   end
diff --git a/app/controllers/projects/team_members_controller.rb b/app/controllers/projects/team_members_controller.rb
index 0791e6080fb..71b0ab7ee82 100644
--- a/app/controllers/projects/team_members_controller.rb
+++ b/app/controllers/projects/team_members_controller.rb
@@ -21,7 +21,8 @@ class Projects::TeamMembersController < Projects::ApplicationController
     if params[:redirect_to]
       redirect_to params[:redirect_to]
     else
-      redirect_to project_team_index_path(@project)
+      redirect_to namespace_project_team_index_path(@project.namespace,
+                                                    @project)
     end
   end
 
@@ -32,7 +33,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
     unless @user_project_relation.valid?
       flash[:alert] = "User should have at least one role"
     end
-    redirect_to project_team_index_path(@project)
+    redirect_to namespace_project_team_index_path(@project.namespace, @project)
   end
 
   def destroy
@@ -40,7 +41,10 @@ class Projects::TeamMembersController < Projects::ApplicationController
     @user_project_relation.destroy
 
     respond_to do |format|
-      format.html { redirect_to project_team_index_path(@project) }
+      format.html do
+        redirect_to namespace_project_team_index_path(@project.namespace,
+                                                      @project)
+      end
       format.js { render nothing: true }
     end
   end
@@ -59,7 +63,8 @@ class Projects::TeamMembersController < Projects::ApplicationController
     status = @project.team.import(giver)
     notice = status ? "Successfully imported" : "Import failed"
 
-    redirect_to project_team_index_path(project), notice: notice
+    redirect_to(namespace_project_team_index_path(project.namespace, project),
+                notice: notice)
   end
 
   protected
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 5b52640a4e1..c7112a3cc10 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -9,7 +9,10 @@ class Projects::TreeController < Projects::ApplicationController
   def show
     if tree.entries.empty?
       if @repository.blob_at(@commit.id, @path)
-        redirect_to project_blob_path(@project, File.join(@ref, @path)) and return
+        redirect_to(
+          namespace_project_blob_path(@project.namespace, @project,
+                                      File.join(@ref, @path))
+        ) and return
       else
         return not_found!
       end
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 0145207bf6f..69824dca944 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -45,7 +45,7 @@ class Projects::WikisController < Projects::ApplicationController
     return render('empty') unless can?(current_user, :write_wiki, @project)
 
     if @page.update(content, format, message)
-      redirect_to [@project, @page], notice: 'Wiki was successfully updated.'
+      redirect_to [@project.namespace.becomes(Namespace), @project, @page], notice: 'Wiki was successfully updated.'
     else
       render 'edit'
     end
@@ -55,7 +55,10 @@ class Projects::WikisController < Projects::ApplicationController
     @page = WikiPage.new(@project_wiki)
 
     if @page.create(wiki_params)
-      redirect_to project_wiki_path(@project, @page), notice: 'Wiki was successfully updated.'
+      redirect_to(
+        namespace_project_wiki_path(@project.namespace, @project, @page),
+        notice: 'Wiki was successfully updated.'
+      )
     else
       render action: "edit"
     end
@@ -65,7 +68,10 @@ class Projects::WikisController < Projects::ApplicationController
     @page = @project_wiki.find_page(params[:id])
 
     unless @page
-      redirect_to(project_wiki_path(@project, :home), notice: "Page not found")
+      redirect_to(
+        namespace_project_wiki_path(@project.namespace, @project, :home),
+        notice: "Page not found"
+      )
     end
   end
 
@@ -73,7 +79,10 @@ class Projects::WikisController < Projects::ApplicationController
     @page = @project_wiki.find_page(params[:id])
     @page.delete if @page
 
-    redirect_to project_wiki_path(@project, :home), notice: "Page was successfully deleted"
+    redirect_to(
+      namespace_project_wiki_path(@project.namespace, @project, :home),
+      notice: "Page was successfully deleted"
+    )
   end
 
   def git_access
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 49d509935284c2f07c8f5cb53a31d5787c6ef7ab Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Sat, 14 Feb 2015 13:26:08 -0700
Subject: Avoid duplicate application rows

Iterate over authorized applications instead of tokens to avoid multiple
rows for the same authorized app.
---
 app/controllers/profiles_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index f7584c03411..e3e36505f0b 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -16,6 +16,9 @@ class ProfilesController < ApplicationController
   def applications
     @applications = current_user.oauth_applications
     @authorized_tokens = current_user.oauth_authorized_tokens
+    @authorized_apps = @authorized_tokens.map do |token|
+      token.application
+    end.uniq
   end
 
   def update
-- 
cgit v1.2.1


From e0f61a59b4e9be1fc2f20320a0400793318b8a9f Mon Sep 17 00:00:00 2001
From: Vinnie Okada <vokada@mrvinn.com>
Date: Sun, 15 Feb 2015 20:50:53 -0700
Subject: Use shorter map() syntax

---
 app/controllers/profiles_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index e3e36505f0b..a7863aba756 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -16,9 +16,7 @@ class ProfilesController < ApplicationController
   def applications
     @applications = current_user.oauth_applications
     @authorized_tokens = current_user.oauth_authorized_tokens
-    @authorized_apps = @authorized_tokens.map do |token|
-      token.application
-    end.uniq
+    @authorized_apps = @authorized_tokens.map(&:application).uniq
   end
 
   def update
-- 
cgit v1.2.1


From 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <Hannes.Rosenoegger@bva.bund.de>
Date: Mon, 9 Feb 2015 14:35:48 +0100
Subject: Fix broken access control and refactor avatar upload

This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
---
 app/controllers/files_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 9671245d3f4..561af8084c3 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -6,7 +6,9 @@ class FilesController < ApplicationController
     if uploader.file_storage?
       if can?(current_user, :read_project, note.project)
         disposition = uploader.image? ? 'inline' : 'attachment'
-        send_file uploader.file.path, disposition: disposition
+        # Replace old notes location in /public with the new one in / and send the file
+        path = uploader.file.path.gsub("#{Rails.root}/public",Rails.root.to_s)
+        send_file path, disposition: disposition
       else
         not_found!
       end
-- 
cgit v1.2.1


From ebd39fc082b09177e0777e5de5729c3f98495e87 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 16 Feb 2015 18:42:52 +0100
Subject: Nitpicking.

---
 app/controllers/files_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 561af8084c3..15523cbc2e7 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -5,9 +5,10 @@ class FilesController < ApplicationController
 
     if uploader.file_storage?
       if can?(current_user, :read_project, note.project)
-        disposition = uploader.image? ? 'inline' : 'attachment'
         # Replace old notes location in /public with the new one in / and send the file
-        path = uploader.file.path.gsub("#{Rails.root}/public",Rails.root.to_s)
+        path = uploader.file.path.gsub("#{Rails.root}/public", Rails.root.to_s)
+
+        disposition = uploader.image? ? 'inline' : 'attachment'
         send_file path, disposition: disposition
       else
         not_found!
-- 
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/files_controller.rb    | 29 +++++++++++++++++++++++++++--
 app/controllers/projects_controller.rb | 18 +++++++-----------
 2 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 15523cbc2e7..a86340dd9bb 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,5 +1,5 @@
 class FilesController < ApplicationController
-  def download
+  def download_notes
     note = Note.find(params[:id])
     uploader = note.attachment
 
@@ -14,7 +14,32 @@ class FilesController < ApplicationController
         not_found!
       end
     else
-      redirect_to uploader.url
+      not_found!
     end
   end
+
+  def download_files
+    namespace_id = params[:namespace]
+    project_id = params[:project]
+    folder_id = params[:folder_id]
+    filename = params[:filename]
+    project_with_namespace="#{namespace_id}/#{project_id}"
+    filename_with_id="#{folder_id}/#{filename}"
+    
+    project = Project.find_with_namespace(project_with_namespace)
+
+    uploader = FileUploader.new("#{Rails.root}/uploads","#{project_with_namespace}/#{folder_id}")
+    uploader.retrieve_from_store!(filename)
+
+    if can?(current_user, :read_project, project)
+      download(uploader)
+    else
+      not_found!
+    end
+  end
+
+  def download(uploader)
+    disposition = uploader.image? ? 'inline' : 'attachment'
+    send_file uploader.file.path, disposition: disposition
+  end
 end
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 9729cc584f5758395960416f308a9c45f698cdee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Sat, 14 Feb 2015 19:52:45 +0100
Subject: implement Project::UploadsController

---
 app/controllers/files_controller.rb            | 29 ++------------------------
 app/controllers/projects/uploads_controller.rb | 16 ++++++++++++++
 2 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 app/controllers/projects/uploads_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a86340dd9bb..15523cbc2e7 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,5 +1,5 @@
 class FilesController < ApplicationController
-  def download_notes
+  def download
     note = Note.find(params[:id])
     uploader = note.attachment
 
@@ -14,32 +14,7 @@ class FilesController < ApplicationController
         not_found!
       end
     else
-      not_found!
+      redirect_to uploader.url
     end
   end
-
-  def download_files
-    namespace_id = params[:namespace]
-    project_id = params[:project]
-    folder_id = params[:folder_id]
-    filename = params[:filename]
-    project_with_namespace="#{namespace_id}/#{project_id}"
-    filename_with_id="#{folder_id}/#{filename}"
-    
-    project = Project.find_with_namespace(project_with_namespace)
-
-    uploader = FileUploader.new("#{Rails.root}/uploads","#{project_with_namespace}/#{folder_id}")
-    uploader.retrieve_from_store!(filename)
-
-    if can?(current_user, :read_project, project)
-      download(uploader)
-    else
-      not_found!
-    end
-  end
-
-  def download(uploader)
-    disposition = uploader.image? ? 'inline' : 'attachment'
-    send_file uploader.file.path, disposition: disposition
-  end
 end
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
new file mode 100644
index 00000000000..1c9fb1c86fb
--- /dev/null
+++ b/app/controllers/projects/uploads_controller.rb
@@ -0,0 +1,16 @@
+class Projects::UploadsController < Projects::ApplicationController
+  layout 'project'
+
+  before_filter :project
+
+  def show
+    folder_id = params[:folder_id]
+    filename = params[:filename]
+    
+    uploader = FileUploader.new("#{Rails.root}/uploads","#{@project.path_with_namespace}/#{folder_id}")
+    uploader.retrieve_from_store!(filename)
+
+    disposition = uploader.image? ? 'inline' : 'attachment'
+    send_file uploader.file.path, disposition: disposition
+  end
+end
-- 
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/files_controller.rb            | 17 +++++++-----
 app/controllers/projects/uploads_controller.rb | 37 +++++++++++++++++++++-----
 app/controllers/projects_controller.rb         | 17 ------------
 3 files changed, 40 insertions(+), 31 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 15523cbc2e7..267239b7b84 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -3,18 +3,21 @@ class FilesController < ApplicationController
     note = Note.find(params[:id])
     uploader = note.attachment
 
-    if uploader.file_storage?
-      if can?(current_user, :read_project, note.project)
-        # Replace old notes location in /public with the new one in / and send the file
+    if can?(current_user, :read_project, note.project)
+      if uploader.file_storage?
         path = uploader.file.path.gsub("#{Rails.root}/public", Rails.root.to_s)
 
-        disposition = uploader.image? ? 'inline' : 'attachment'
-        send_file path, disposition: disposition
+        if File.exist?(path)
+          disposition = uploader.image? ? 'inline' : 'attachment'
+          send_file path, disposition: disposition
+        else
+          not_found!
+        end
       else
-        not_found!
+        redirect_to uploader.url
       end
     else
-      redirect_to uploader.url
+      not_found!
     end
   end
 end
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index 1c9fb1c86fb..355163ac879 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -3,14 +3,37 @@ class Projects::UploadsController < Projects::ApplicationController
 
   before_filter :project
 
+  def create
+    link_to_file = ::Projects::UploadService.new(repository, params[:file]).
+      execute
+
+    respond_to do |format|
+      if link_to_file
+        format.json do
+          render json: { link: link_to_file }
+        end
+      else
+        format.json do
+          render json: 'Invalid file.', status: :unprocessable_entity
+        end
+      end
+    end
+  end
+
   def show
-    folder_id = params[:folder_id]
-    filename = params[:filename]
-    
-    uploader = FileUploader.new("#{Rails.root}/uploads","#{@project.path_with_namespace}/#{folder_id}")
-    uploader.retrieve_from_store!(filename)
+    uploader = FileUploader.new(project, params[:secret])
+
+    if uploader.file_storage?
+      uploader.retrieve_from_store!(params[:filename])
 
-    disposition = uploader.image? ? 'inline' : 'attachment'
-    send_file uploader.file.path, disposition: disposition
+      if uploader.file.exists?
+        disposition = uploader.image? ? 'inline' : 'attachment'
+        send_file uploader.file.path, disposition: disposition
+      else
+        not_found!
+      end
+    else
+      redirect_to uploader.url
+    end
   end
 end
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 70edf950fe6baf90bb98c904d9132924e55e50d6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 17 Feb 2015 22:40:00 -0800
Subject: Show contributed projects on user page and stars for it

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

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 84a04c5ebe6..e4f588c6a60 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,6 +8,9 @@ class UsersController < ApplicationController
     visible_projects = ProjectsFinder.new.execute(current_user)
     authorized_projects_ids = visible_projects.pluck(:id)
 
+    @contributed_projects = Project.where(id: authorized_projects_ids).
+      in_group_namespace
+
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids)
 
-- 
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/dashboard_controller.rb | 15 +++++++++------
 app/controllers/groups_controller.rb    | 17 +++++++++++------
 app/controllers/projects_controller.rb  | 13 ++++++++-----
 app/controllers/users_controller.rb     |  7 ++++---
 4 files changed, 32 insertions(+), 20 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 9e59264e418..ee9dc343337 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -12,11 +12,7 @@ class DashboardController < ApplicationController
     @groups = current_user.authorized_groups.order_name_asc
     @has_authorized_projects = @projects.count > 0
     @projects_count = @projects.count
-    @projects = @projects.limit(@projects_limit)
-
-    @events = Event.in_projects(current_user.authorized_projects.pluck(:id))
-    @events = @event_filter.apply_filter(@events)
-    @events = @events.limit(20).offset(params[:offset] || 0)
+    @projects = @projects.includes(:namespace).limit(@projects_limit)
 
     @last_push = current_user.recent_push
 
@@ -24,7 +20,14 @@ class DashboardController < ApplicationController
 
     respond_to do |format|
       format.html
-      format.json { pager_json("events/_events", @events.count) }
+
+      format.json do
+        @events = Event.in_projects(current_user.authorized_projects.pluck(:id))
+        @events = @event_filter.apply_filter(@events).includes(:target, project: :namespace)
+        @events = @events.limit(20).offset(params[:offset] || 0)
+        pager_json("events/_events", @events.count)
+      end
+
       format.atom { render layout: false }
     end
   end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index aad3709090e..7b7531f1426 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -10,11 +10,11 @@ class GroupsController < ApplicationController
 
   # Load group projects
   before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
+  before_filter :event_filter, only: :show
+  before_filter :set_title, only: [:new, :create]
 
   layout :determine_layout
 
-  before_filter :set_title, only: [:new, :create]
-
   def new
     @group = Group.new
   end
@@ -32,14 +32,19 @@ class GroupsController < ApplicationController
   end
 
   def show
-    @events = Event.in_projects(project_ids)
-    @events = event_filter.apply_filter(@events)
-    @events = @events.limit(20).offset(params[:offset] || 0)
     @last_push = current_user.recent_push if current_user
+    @projects = @projects.includes(:namespace)
 
     respond_to do |format|
       format.html
-      format.json { pager_json("events/_events", @events.count) }
+
+      format.json do
+        @events = Event.in_projects(project_ids)
+        @events = event_filter.apply_filter(@events).includes(:target, project: :namespace)
+        @events = @events.limit(20).offset(params[:offset] || 0)
+        pager_json("events/_events", @events.count)
+      end
+
       format.atom { render layout: false }
     end
   end
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
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e4f588c6a60..b4de500fcf1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,17 +9,18 @@ class UsersController < ApplicationController
     authorized_projects_ids = visible_projects.pluck(:id)
 
     @contributed_projects = Project.where(id: authorized_projects_ids).
-      in_group_namespace
+      in_group_namespace.includes(:namespace)
 
     @projects = @user.personal_projects.
-      where(id: authorized_projects_ids)
+      where(id: authorized_projects_ids).includes(:namespace)
 
     # Collect only groups common for both users
     @groups = @user.groups & GroupsFinder.new.execute(current_user)
 
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
-      where(project_id: authorized_projects_ids).limit(30)
+      where(project_id: authorized_projects_ids).
+      includes(:target, project: :namespace).limit(30)
 
     @title = @user.name
     @title_url = user_path(@user)
-- 
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/dashboard_controller.rb | 15 +++++++++++----
 app/controllers/groups_controller.rb    | 15 +++++++++++----
 app/controllers/projects_controller.rb  |  2 +-
 app/controllers/users_controller.rb     |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index ee9dc343337..eca7b39bcdf 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -22,13 +22,14 @@ class DashboardController < ApplicationController
       format.html
 
       format.json do
-        @events = Event.in_projects(current_user.authorized_projects.pluck(:id))
-        @events = @event_filter.apply_filter(@events).includes(:target, project: :namespace)
-        @events = @events.limit(20).offset(params[:offset] || 0)
+        load_events
         pager_json("events/_events", @events.count)
       end
 
-      format.atom { render layout: false }
+      format.atom do
+        load_events
+        render layout: false
+      end
     end
   end
 
@@ -77,4 +78,10 @@ class DashboardController < ApplicationController
   def load_projects
     @projects = current_user.authorized_projects.sorted_by_activity.non_archived
   end
+
+  def load_events
+    @events = Event.in_projects(current_user.authorized_projects.pluck(:id))
+    @events = @event_filter.apply_filter(@events).with_associations
+    @events = @events.limit(20).offset(params[:offset] || 0)
+  end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 7b7531f1426..d011523c94f 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -39,13 +39,14 @@ class GroupsController < ApplicationController
       format.html
 
       format.json do
-        @events = Event.in_projects(project_ids)
-        @events = event_filter.apply_filter(@events).includes(:target, project: :namespace)
-        @events = @events.limit(20).offset(params[:offset] || 0)
+        load_events
         pager_json("events/_events", @events.count)
       end
 
-      format.atom { render layout: false }
+      format.atom do
+        load_events
+        render layout: false
+      end
     end
   end
 
@@ -154,4 +155,10 @@ class GroupsController < ApplicationController
   def group_params
     params.require(:group).permit(:name, :description, :path, :avatar)
   end
+
+  def load_events
+    @events = Event.in_projects(project_ids)
+    @events = event_filter.apply_filter(@events).with_associations
+    @events = @events.limit(20).offset(params[:offset] || 0)
+  end
 end
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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b4de500fcf1..8c5605c8b4b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,7 +20,7 @@ class UsersController < ApplicationController
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
       where(project_id: authorized_projects_ids).
-      includes(:target, project: :namespace).limit(30)
+      with_associations.limit(30)
 
     @title = @user.name
     @title_url = user_path(@user)
-- 
cgit v1.2.1


From 2f0a764d310a8fc6628f560debfa930ef2842297 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 13:28:24 -0800
Subject: Fix user page performance and authorization

---
 app/controllers/users_controller.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c5605c8b4b..4c2fe4c3c8d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,11 +4,8 @@ class UsersController < ApplicationController
   layout :determine_layout
 
   def show
-    # Projects user can view
-    visible_projects = ProjectsFinder.new.execute(current_user)
-    authorized_projects_ids = visible_projects.pluck(:id)
-
-    @contributed_projects = Project.where(id: authorized_projects_ids).
+    @contributed_projects = Project.
+      where(id: authorized_projects_ids & @user.contributed_projects_ids).
       in_group_namespace.includes(:namespace)
 
     @projects = @user.personal_projects.
@@ -32,8 +29,8 @@ class UsersController < ApplicationController
   end
 
   def calendar
-    visible_projects = ProjectsFinder.new.execute(current_user)
-    calendar = Gitlab::CommitsCalendar.new(visible_projects, @user)
+    projects = Project.where(id: authorized_projects_ids & @user.contributed_projects_ids)
+    calendar = Gitlab::CommitsCalendar.new(projects, @user)
     @timestamps = calendar.timestamps
     @starting_year = calendar.starting_year
     @starting_month = calendar.starting_month
@@ -58,4 +55,10 @@ class UsersController < ApplicationController
       return authenticate_user!
     end
   end
+
+  def authorized_projects_ids
+    # Projects user can view
+    @authorized_projects_ids ||=
+      ProjectsFinder.new.execute(current_user).pluck(:id)
+  end
 end
-- 
cgit v1.2.1


From 86d5e20664856a0f6635ba184dd85a4f342f8b8f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 16:40:22 -0800
Subject: Respect star ordering on explore page

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

(limited to 'app/controllers')

diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index d75fd8e72fa..0e5891ae807 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -18,7 +18,7 @@ class Explore::ProjectsController < ApplicationController
 
   def starred
     @starred_projects = ProjectsFinder.new.execute(current_user)
-    @starred_projects = @starred_projects.order('star_count DESC')
+    @starred_projects = @starred_projects.reorder('star_count DESC')
     @starred_projects = @starred_projects.page(params[:page]).per(10)
   end
 end
-- 
cgit v1.2.1


From 7c3147e6e969a7ae97e2f8d05e536abeeb7d3936 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 19 Feb 2015 08:57:33 -0800
Subject: Revert "Nitpicking."

This reverts commit ebd39fc082b09177e0777e5de5729c3f98495e87.
---
 app/controllers/files_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 15523cbc2e7..561af8084c3 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -5,10 +5,9 @@ class FilesController < ApplicationController
 
     if uploader.file_storage?
       if can?(current_user, :read_project, note.project)
-        # Replace old notes location in /public with the new one in / and send the file
-        path = uploader.file.path.gsub("#{Rails.root}/public", Rails.root.to_s)
-
         disposition = uploader.image? ? 'inline' : 'attachment'
+        # Replace old notes location in /public with the new one in / and send the file
+        path = uploader.file.path.gsub("#{Rails.root}/public",Rails.root.to_s)
         send_file path, disposition: disposition
       else
         not_found!
-- 
cgit v1.2.1


From 8184a6564454faf0f9ae9dfee1377c3407d08447 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 19 Feb 2015 08:57:35 -0800
Subject: Revert "Fix broken access control and refactor avatar upload"

This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
---
 app/controllers/files_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 561af8084c3..9671245d3f4 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -6,9 +6,7 @@ class FilesController < ApplicationController
     if uploader.file_storage?
       if can?(current_user, :read_project, note.project)
         disposition = uploader.image? ? 'inline' : 'attachment'
-        # Replace old notes location in /public with the new one in / and send the file
-        path = uploader.file.path.gsub("#{Rails.root}/public",Rails.root.to_s)
-        send_file path, disposition: disposition
+        send_file uploader.file.path, disposition: disposition
       else
         not_found!
       end
-- 
cgit v1.2.1


From 00ca490259de684f4240de4f61728b8eaefbb13e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 13:13:48 +0100
Subject: Use controllers to serve uploads, with XSS prevention and access
 control.

---
 app/controllers/projects/uploads_controller.rb | 19 +++++++++++++++++++
 app/controllers/uploads_controller.rb          | 17 +++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 app/controllers/projects/uploads_controller.rb
 create mode 100644 app/controllers/uploads_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
new file mode 100644
index 00000000000..b922b56418a
--- /dev/null
+++ b/app/controllers/projects/uploads_controller.rb
@@ -0,0 +1,19 @@
+class Projects::UploadsController < Projects::ApplicationController
+  layout "project"
+
+  before_filter :project
+
+  def show
+    path = File.join(project.path_with_namespace, params[:secret])
+    uploader = FileUploader.new('uploads', path)
+
+    uploader.retrieve_from_store!(params[:filename])
+
+    if uploader.file.exists?
+      # Right now, these are always images, so we can safely render them inline.
+      send_file uploader.file.path, disposition: 'inline'
+    else
+      not_found!
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
new file mode 100644
index 00000000000..d5877977258
--- /dev/null
+++ b/app/controllers/uploads_controller.rb
@@ -0,0 +1,17 @@
+class UploadsController < ApplicationController
+  def show
+    model = params[:model].camelize.constantize.find(params[:id])
+    uploader = model.send(params[:mounted_as])
+
+    if uploader.file_storage?
+      if !model.respond_to?(:project) || can?(current_user, :read_project, model.project)
+        disposition = uploader.image? ? 'inline' : 'attachment'
+        send_file uploader.file.path, disposition: disposition
+      else
+        not_found!
+      end
+    else
+      redirect_to uploader.url
+    end
+  end
+end
-- 
cgit v1.2.1


From c801df81fb48272b670b7448e3898a98cdb8b742 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 14:39:35 +0100
Subject: Satisfy Rubocop.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index b922b56418a..2b4da35bc7f 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -16,4 +16,4 @@ class Projects::UploadsController < Projects::ApplicationController
       not_found!
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From 7f1adc3d9cdc5c3f1c0fcbf6c72d89b8ee062af5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 15:56:12 +0100
Subject: Fix URL to uploaded file.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index 53b92d8643d..9020e86c44e 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -4,7 +4,7 @@ class Projects::UploadsController < Projects::ApplicationController
   before_filter :project
 
   def create
-    link_to_file = ::Projects::UploadService.new(repository, params[:file]).
+    link_to_file = ::Projects::UploadService.new(project, params[:file]).
       execute
 
     respond_to do |format|
-- 
cgit v1.2.1


From 938a1381fc89d39df9c440aad2f95e3b93d80f3b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 14:39:35 +0100
Subject: Satisfy Rubocop.

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index b922b56418a..2b4da35bc7f 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -16,4 +16,4 @@ class Projects::UploadsController < Projects::ApplicationController
       not_found!
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From 00408f37e34f37f1299df6957f62bfa7ff341749 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 20 Feb 2015 16:30:15 +0100
Subject: Move 'require_non_empty_project' filter to front so 'assign_ref_vars'
 doesn't 404.

---
 app/controllers/projects/blame_controller.rb        | 2 +-
 app/controllers/projects/blob_controller.rb         | 2 +-
 app/controllers/projects/branches_controller.rb     | 1 -
 app/controllers/projects/commit_controller.rb       | 2 +-
 app/controllers/projects/commits_controller.rb      | 2 +-
 app/controllers/projects/compare_controller.rb      | 2 +-
 app/controllers/projects/forks_controller.rb        | 2 +-
 app/controllers/projects/graphs_controller.rb       | 2 +-
 app/controllers/projects/network_controller.rb      | 2 +-
 app/controllers/projects/raw_controller.rb          | 2 +-
 app/controllers/projects/refs_controller.rb         | 2 +-
 app/controllers/projects/repositories_controller.rb | 2 +-
 app/controllers/projects/tree_controller.rb         | 2 +-
 13 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index 106f21b83e6..489a6ae5666 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -2,9 +2,9 @@
 class Projects::BlameController < Projects::ApplicationController
   include ExtractsPath
 
+  before_filter :require_non_empty_project
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
 
   def show
     @blob = @repository.blob_at(@commit.id, @path)
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index dccb96ba1d1..8071f13173d 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -5,8 +5,8 @@ class Projects::BlobController < Projects::ApplicationController
   # Raised when given an invalid file path
   class InvalidPathError < StandardError; end
 
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project, except: [:new, :create]
+  before_filter :authorize_download_code!
   before_filter :authorize_push_code!, only: [:destroy]
   before_filter :assign_blob_vars
   before_filter :commit, except: [:new, :create]
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index cff1a907dc2..f7bb36c40bb 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -2,7 +2,6 @@ class Projects::BranchesController < Projects::ApplicationController
   include ActionView::Helpers::SanitizeHelper
   # Authorize
   before_filter :require_non_empty_project
-
   before_filter :authorize_download_code!
   before_filter :authorize_push_code!, only: [:create, :destroy]
 
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 96a782bdf7a..87e39f1363a 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -3,8 +3,8 @@
 # Not to be confused with CommitsController, plural.
 class Projects::CommitController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project
+  before_filter :authorize_download_code!
   before_filter :commit
 
   def show
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index b133afe44b5..4b6ab437476 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -3,9 +3,9 @@ require "base64"
 class Projects::CommitsController < Projects::ApplicationController
   include ExtractsPath
 
+  before_filter :require_non_empty_project
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
 
   def show
     @repo = @project.repository
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index ffb8c2e4af1..8a359042d7b 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -1,7 +1,7 @@
 class Projects::CompareController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project
+  before_filter :authorize_download_code!
 
   def index
   end
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index a0481d11582..414da0bbdc9 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@@ -1,7 +1,7 @@
 class Projects::ForksController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project
+  before_filter :authorize_download_code!
 
   def new
     @namespaces = current_user.manageable_namespaces
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index 4a318cb7d56..752474b4a4c 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -1,7 +1,7 @@
 class Projects::GraphsController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project
+  before_filter :authorize_download_code!
 
   def show
     respond_to do |format|
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index 59f2a745367..83d1c1dacae 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -2,9 +2,9 @@ class Projects::NetworkController < Projects::ApplicationController
   include ExtractsPath
   include ApplicationHelper
 
+  before_filter :require_non_empty_project
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
 
   def show
     respond_to do |format|
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index c4ddc32e8c3..b1a029ce696 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -2,9 +2,9 @@
 class Projects::RawController < Projects::ApplicationController
   include ExtractsPath
 
+  before_filter :require_non_empty_project
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
 
   def show
     @blob = @repository.blob_at(@commit.id, @path)
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index b80472f8eb4..0adecded17e 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -1,9 +1,9 @@
 class Projects::RefsController < Projects::ApplicationController
   include ExtractsPath
 
+  before_filter :require_non_empty_project
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project
 
   def switch
     respond_to do |format|
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 3a90c1c806d..320c3965265 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -1,7 +1,7 @@
 class Projects::RepositoriesController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_download_code!
   before_filter :require_non_empty_project, except: :create
+  before_filter :authorize_download_code!
   before_filter :authorize_admin_project!, only: :create
 
   def create
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 5b52640a4e1..70cd5a62ff5 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -2,9 +2,9 @@
 class Projects::TreeController < Projects::ApplicationController
   include ExtractsPath
 
+  before_filter :require_non_empty_project, except: [:new, :create]
   before_filter :assign_ref_vars
   before_filter :authorize_download_code!
-  before_filter :require_non_empty_project, except: [:new, :create]
 
   def show
     if tree.entries.empty?
-- 
cgit v1.2.1


From 157b4b4b1f41267375d3b32c9c1606a538eb8488 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <m@ku1ik.com>
Date: Fri, 20 Feb 2015 17:38:41 +0000
Subject: Add gitorious.org importer

---
 app/controllers/import/gitorious_controller.rb | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 app/controllers/import/gitorious_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/import/gitorious_controller.rb b/app/controllers/import/gitorious_controller.rb
new file mode 100644
index 00000000000..627b4a171b8
--- /dev/null
+++ b/app/controllers/import/gitorious_controller.rb
@@ -0,0 +1,43 @@
+class Import::GitoriousController < Import::BaseController
+
+  def new
+    redirect_to client.authorize_url(callback_import_gitorious_url)
+  end
+
+  def callback
+    session[:gitorious_repos] = params[:repos]
+    redirect_to status_import_gitorious_url
+  end
+
+  def status
+    @repos = client.repos
+
+    @already_added_projects = current_user.created_projects.where(import_type: "gitorious")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.to_a.reject! { |repo| already_added_projects_names.include? repo.full_name }
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "gitorious").to_json(only: [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id]
+    repo = client.repo(@repo_id)
+    @target_namespace = params[:new_namespace].presence || repo.namespace
+    @project_name = repo.name
+
+    namespace = get_or_create_namespace || (render and return)
+
+    @project = Gitlab::GitoriousImport::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::GitoriousImport::Client.new(session[:gitorious_repos])
+  end
+
+end
-- 
cgit v1.2.1


From 9459e9db2470e9c50488811d1d0fcdd025a327d0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 22 Feb 2015 22:26:09 -0800
Subject: Fix updating issue 500 error

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index d1bf842ec1a..73b58285c61 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -79,7 +79,7 @@ class Projects::IssuesController < Projects::ApplicationController
       format.js
       format.html do
         if @issue.valid?
-          redirect_to [@project.namespace, @project, @issue]
+          redirect_to [@project.namespace.becomes(Namespace), @project, @issue]
         else
           render :edit
         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')

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 897a2de54c1d5cbead4589d44a3d173c14849f23 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 23 Feb 2015 19:35:42 -0800
Subject: Allow non authenticated access to avatars

---
 app/controllers/uploads_controller.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index d5877977258..73b124bb34c 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -1,4 +1,7 @@
 class UploadsController < ApplicationController
+  skip_before_filter :authenticate_user!, :reject_blocked
+  before_filter :authorize_access
+
   def show
     model = params[:model].camelize.constantize.find(params[:id])
     uploader = model.send(params[:mounted_as])
@@ -14,4 +17,10 @@ class UploadsController < ApplicationController
       redirect_to uploader.url
     end
   end
+
+  def authorize_access
+    unless params[:mounted_as] == 'avatar'
+      authenticate_user! && reject_blocked
+    end
+  end
 end
-- 
cgit v1.2.1


From 71a844cdaee129d4e300c20cbb27db009cf81b73 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Sat, 14 Feb 2015 18:18:05 +0200
Subject: Web Editor: save to new branch

---
 app/controllers/projects/blob_controller.rb | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 1207548eae0..4b7eb4df298 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -1,6 +1,7 @@
 # Controller for viewing a file's blame
 class Projects::BlobController < Projects::ApplicationController
   include ExtractsPath
+  include ActionView::Helpers::SanitizeHelper
 
   # Raised when given an invalid file path
   class InvalidPathError < StandardError; end
@@ -21,11 +22,18 @@ class Projects::BlobController < Projects::ApplicationController
 
   def create
     file_path = File.join(@path, File.basename(params[:file_name]))
-    result = Files::CreateService.new(@project, current_user, params, @ref, file_path).execute
+    result = Files::CreateService.new(
+      @project,
+      current_user,
+      params.merge(new_branch: sanitized_new_branch_name),
+      @ref,
+      file_path
+    ).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@ref, file_path))
+      ref = sanitized_new_branch_name.presence || @ref
+      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(ref, file_path))
     else
       flash[:alert] = result[:message]
       render :new
@@ -41,7 +49,13 @@ class Projects::BlobController < Projects::ApplicationController
 
   def update
     result = Files::UpdateService.
-      new(@project, current_user, params, @ref, @path).execute
+      new(
+        @project,
+        current_user,
+        params.merge(new_branch: sanitized_new_branch_name),
+        @ref,
+        @path
+      ).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
@@ -131,6 +145,8 @@ class Projects::BlobController < Projects::ApplicationController
       if from_merge_request
         diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
           "#file-path-#{hexdigest(@path)}"
+      elsif sanitized_new_branch_name.present?
+        namespace_project_blob_path(@project.namespace, @project, File.join(sanitized_new_branch_name, @path))
       else
         namespace_project_blob_path(@project.namespace, @project, @id)
       end
@@ -140,4 +156,8 @@ class Projects::BlobController < Projects::ApplicationController
     # If blob edit was initiated from merge request page
     @from_merge_request ||= MergeRequest.find_by(id: params[:from_merge_request_id])
   end
+
+  def sanitized_new_branch_name
+    @new_branch ||= sanitize(strip_tags(params[:new_branch]))
+  end
 end
-- 
cgit v1.2.1


From ad6d6232342558705c54ba70a94f9d7ddbd00f8c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 17 Feb 2015 16:59:50 +0100
Subject: Add Bitbucket importer.

---
 app/controllers/import/bitbucket_controller.rb | 74 ++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/controllers/import/bitbucket_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
new file mode 100644
index 00000000000..27e91f49f2b
--- /dev/null
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -0,0 +1,74 @@
+class Import::BitbucketController < Import::BaseController
+  before_filter :bitbucket_auth, except: :callback
+
+  # rescue_from OAuth::Error, with: :bitbucket_unauthorized
+
+  def callback
+    request_token = session.delete(:oauth_request_token) 
+    raise "Session expired!" if request_token.nil?
+
+    request_token.symbolize_keys!
+    
+    access_token = client.get_token(request_token, params[:oauth_verifier], callback_import_bitbucket_url)
+
+    current_user.bitbucket_access_token = access_token.token
+    current_user.bitbucket_access_token_secret = access_token.secret
+
+    current_user.save
+    redirect_to status_import_bitbucket_url
+  end
+
+  def status
+    @repos = client.projects
+    
+    @already_added_projects = current_user.created_projects.where(import_type: "bitbucket")
+    already_added_projects_names = @already_added_projects.pluck(:import_source)
+
+    @repos.to_a.reject!{ |repo| already_added_projects_names.include? "#{repo["owner"]}/#{repo["slug"]}" }
+  end
+
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "bitbucket").to_json(only: [:id, :import_status])
+    render json: jobs
+  end
+
+  def create
+    @repo_id = params[:repo_id] || ""
+    repo = client.project(@repo_id.gsub("___", "/"))
+    @target_namespace = params[:new_namespace].presence || repo["owner"]
+    @project_name = repo["slug"]
+    
+    namespace = get_or_create_namespace || (render and return)
+
+    unless Gitlab::BitbucketImport::KeyAdder.new(repo, current_user).execute
+      @access_denied = true
+      render
+      return
+    end
+
+    @project = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, current_user).execute
+  end
+
+  private
+
+  def client
+    @client ||= Gitlab::BitbucketImport::Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
+  end
+
+  def bitbucket_auth
+    if current_user.bitbucket_access_token.blank?
+      go_to_bitbucket_for_permissions
+    end
+  end
+
+  def go_to_bitbucket_for_permissions
+    request_token = client.request_token(callback_import_bitbucket_url)
+    session[:oauth_request_token] = request_token
+
+    redirect_to client.authorize_url(request_token, callback_import_bitbucket_url)
+  end
+
+  def bitbucket_unauthorized
+    go_to_bitbucket_for_permissions
+  end
+end
-- 
cgit v1.2.1


From 448817c4de965bf7286f33a3447937987a8864a1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 17 Feb 2015 22:52:32 +0100
Subject: Load public key in initializer.

---
 app/controllers/application_controller.rb      | 13 +++++++++++++
 app/controllers/import/bitbucket_controller.rb |  5 +++++
 app/controllers/import/github_controller.rb    |  5 +++++
 app/controllers/import/gitlab_controller.rb    |  5 +++++
 4 files changed, 28 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eb3be08df56..7940b5cb3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   helper_method :abilities, :can?, :current_application_settings
+  helper_method :github_import_enabled?, :gitlab_import_enabled?, :bitbucket_import_enabled?
 
   rescue_from Encoding::CompatibilityError do |exception|
     log_exception(exception)
@@ -313,4 +314,16 @@ class ApplicationController < ActionController::Base
     set_filter_values(merge_requests)
     merge_requests
   end
+
+  def github_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:github)
+  end
+
+  def gitlab_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:gitlab)
+  end
+
+  def bitbucket_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:bitbucket) && Gitlab::BitbucketImport.public_key.present?
+  end
 end
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 27e91f49f2b..89de5c5205f 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -1,4 +1,5 @@
 class Import::BitbucketController < Import::BaseController
+  before_filter :verify_bitbucket_import_enabled
   before_filter :bitbucket_auth, except: :callback
 
   # rescue_from OAuth::Error, with: :bitbucket_unauthorized
@@ -55,6 +56,10 @@ class Import::BitbucketController < Import::BaseController
     @client ||= Gitlab::BitbucketImport::Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
   end
 
+  def verify_bitbucket_import_enabled
+    not_found! unless bitbucket_import_enabled?
+  end
+
   def bitbucket_auth
     if current_user.bitbucket_access_token.blank?
       go_to_bitbucket_for_permissions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index c869c7c86f3..dc7668ee6fd 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,4 +1,5 @@
 class Import::GithubController < Import::BaseController
+  before_filter :verify_github_import_enabled
   before_filter :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
@@ -44,6 +45,10 @@ class Import::GithubController < Import::BaseController
     @client ||= Gitlab::GithubImport::Client.new(current_user.github_access_token)
   end
 
+  def verify_github_import_enabled
+    not_found! unless github_import_enabled?
+  end
+
   def github_auth
     if current_user.github_access_token.blank?
       go_to_github_for_permissions
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index a51ea36aff8..74f992b4699 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -1,4 +1,5 @@
 class Import::GitlabController < Import::BaseController
+  before_filter :verify_gitlab_import_enabled
   before_filter :gitlab_auth, except: :callback
 
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
@@ -41,6 +42,10 @@ class Import::GitlabController < Import::BaseController
     @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
   end
 
+  def verify_gitlab_import_enabled
+    not_found! unless gitlab_import_enabled?
+  end
+
   def gitlab_auth
     if current_user.gitlab_access_token.blank?
       go_to_gitlab_for_permissions
-- 
cgit v1.2.1


From 16c767814a921ab0d7ad3c551bb439a9e270f7b7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Sat, 21 Feb 2015 11:08:05 +0100
Subject: Re-enable rescuing from Bitbucket OAuth errors.

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

(limited to 'app/controllers')

diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 89de5c5205f..83ebc5fddca 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -2,7 +2,7 @@ class Import::BitbucketController < Import::BaseController
   before_filter :verify_bitbucket_import_enabled
   before_filter :bitbucket_auth, except: :callback
 
-  # rescue_from OAuth::Error, with: :bitbucket_unauthorized
+  rescue_from OAuth::Error, with: :bitbucket_unauthorized
 
   def callback
     request_token = session.delete(:oauth_request_token) 
-- 
cgit v1.2.1


From 1bf9fa8c7fc027b5273c143949e57eac9bef52a4 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 24 Feb 2015 16:28:23 +0100
Subject: Exclude forks from profile contributions list.

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

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4c2fe4c3c8d..8a13394dbac 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,7 +6,9 @@ class UsersController < ApplicationController
   def show
     @contributed_projects = Project.
       where(id: authorized_projects_ids & @user.contributed_projects_ids).
-      in_group_namespace.includes(:namespace)
+      in_group_namespace.
+      includes(:namespace).
+      reject(&:forked?)
 
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids).includes(:namespace)
-- 
cgit v1.2.1


From f7c948223d000e4488d864d50f3292a6c7afeaf7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 24 Feb 2015 09:08:34 -0800
Subject: Fix access to attachments uploaded with 'Choose file' button for
 public access

---
 app/controllers/files_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 9671245d3f4..a130bcba9c9 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,4 +1,6 @@
 class FilesController < ApplicationController
+  skip_before_filter :authenticate_user!, :reject_blocked
+
   def download
     note = Note.find(params[:id])
     uploader = note.attachment
-- 
cgit v1.2.1


From 9c6f0487950f1b510d7222885ed8591607b4fe9b Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Wed, 25 Feb 2015 12:18:15 +0200
Subject: Fix GitLab importer. Hide already imported projects

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

(limited to 'app/controllers')

diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index a51ea36aff8..c18178abf76 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -16,7 +16,7 @@ class Import::GitlabController < Import::BaseController
     @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.to_a.reject!{ |repo| already_added_projects_names.include? repo["path_with_namespace"] }
+    @repos = @repos.to_a.reject{ |repo| already_added_projects_names.include? repo["path_with_namespace"] }
   end
 
   def jobs
-- 
cgit v1.2.1


From 00c631573f1f7564cfd8d823dce761fc6c76e2bc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 25 Feb 2015 15:16:24 +0100
Subject: Fix Gitorious import status page hiding of already added projects.

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

(limited to 'app/controllers')

diff --git a/app/controllers/import/gitorious_controller.rb b/app/controllers/import/gitorious_controller.rb
index 627b4a171b8..6067a87ee04 100644
--- a/app/controllers/import/gitorious_controller.rb
+++ b/app/controllers/import/gitorious_controller.rb
@@ -15,7 +15,7 @@ class Import::GitoriousController < Import::BaseController
     @already_added_projects = current_user.created_projects.where(import_type: "gitorious")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
-    @repos.to_a.reject! { |repo| already_added_projects_names.include? repo.full_name }
+    @repos.reject! { |repo| already_added_projects_names.include? repo.full_name }
   end
 
   def jobs
-- 
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/avatars_controller.rb      | 2 +-
 app/controllers/projects/repositories_controller.rb | 2 +-
 app/controllers/projects_controller.rb              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
index b90a95c3aab..a482b90880d 100644
--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -24,6 +24,6 @@ class Projects::AvatarsController < Projects::ApplicationController
     @project.save
     @project.reset_events_cache
 
-    redirect_to edit_namespace_project_path(@project.namespace, @project)
+    redirect_to edit_project_path(@project)
   end
 end
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 245dfb7bb9a..cbb888b25e8 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -7,7 +7,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
   def create
     @project.create_repository
 
-    redirect_to namespace_project_path(@project.namespace, @project)
+    redirect_to project_path(@project)
   end
 
   def archive
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


From 128012dba8737b0dc65d41a3eb1690c9d8797a34 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 Feb 2015 19:50:01 -0800
Subject: More use of shortcut routes

---
 app/controllers/projects/issues_controller.rb         | 8 +++-----
 app/controllers/projects/merge_requests_controller.rb | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 73b58285c61..6a2af08a199 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -60,8 +60,7 @@ class Projects::IssuesController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         if @issue.valid?
-          redirect_to namespace_project_issue_path(@project.namespace,
-                                                   @project, @issue)
+          redirect_to issue_path(@issue)
         else
           render :new
         end
@@ -79,7 +78,7 @@ class Projects::IssuesController < Projects::ApplicationController
       format.js
       format.html do
         if @issue.valid?
-          redirect_to [@project.namespace.becomes(Namespace), @project, @issue]
+          redirect_to issue_path(@issue)
         else
           render :edit
         end
@@ -129,8 +128,7 @@ class Projects::IssuesController < Projects::ApplicationController
     issue = @project.issues.find_by(id: params[:id])
 
     if issue
-      redirect_to namespace_project_issue_path(@project.namespace, @project,
-                                               issue)
+      redirect_to issue_path(issue)
       return
     else
       raise ActiveRecord::RecordNotFound.new
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 98e4775e409..f07923d6d9e 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -79,9 +79,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     if @merge_request.valid?
       redirect_to(
-        namespace_project_merge_request_path(@merge_request.target_project.namespace,
-                                             @merge_request.target_project,
-                                             @merge_request),
+        merge_request_path(@merge_request)
         notice: 'Merge request was successfully created.'
       )
     else
-- 
cgit v1.2.1


From 6de4e4a622a98d86a44e9adf2fca15ff30c478c7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 Feb 2015 09:34:20 -0800
Subject: Include route helper shortcut in controller

---
 app/controllers/application_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7940b5cb3f4..df1a588313e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,6 +2,7 @@ require 'gon'
 
 class ApplicationController < ActionController::Base
   include Gitlab::CurrentSettings
+  include GitlabRoutingHelper
 
   before_filter :authenticate_user_from_token!
   before_filter :authenticate_user!
-- 
cgit v1.2.1


From 6ac0a0217cfcfa9915d5380337b9e5dd25b699ea Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 Feb 2015 16:44:52 -0800
Subject: Fix syntax issue

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

(limited to 'app/controllers')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index f07923d6d9e..26d4c51773f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -79,7 +79,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     if @merge_request.valid?
       redirect_to(
-        merge_request_path(@merge_request)
+        merge_request_path(@merge_request),
         notice: 'Merge request was successfully created.'
       )
     else
-- 
cgit v1.2.1