Revert "squashed merge and fixed conflicts"

This reverts commit 13e37a3e.

app/assets/stylesheets/pages/issuable.scss

@@ -34,10 +34,6 @@
     color: inherit;
   }
-  .issuable-header-text {
-    margin-top: 7px;
-  }
-
   .block {
     @include clearfix;
     padding: $gl-padding 0;
@@ -64,6 +60,10 @@
       margin-top: 0;
     }
+    .issuable-count {
+      margin-top: 7px;
+    }
+
     .gutter-toggle {
       margin-left: 20px;
       padding-left: 10px;
@@ -145,6 +145,7 @@
       .assign-yourself {
         margin-top: 10px;
+        font-weight: normal;
         display: block;
       }
     }
@@ -157,10 +158,6 @@
       font-weight: normal;
     }
-    .no-value {
-      color: $gl-placeholder-color;
-    }
-
     .sidebar-collapsed-icon {
       display: none;
     }
@@ -251,16 +248,11 @@
       padding-bottom: 0;
       margin-bottom: 10px;
     }
-
-    .issuable-header-btn {
-      display: none;
-    }
   }
-  .issuable-header-btn {
+  .issuable-pager {
     background: $gray-normal;
     border: 1px solid $border-gray-normal;
-    
     &:hover {
       background: $gray-dark;
       border: 1px solid $border-gray-dark;
@@ -271,7 +263,7 @@
     }
   }
-  a {
+  a:not(.issuable-pager) {
     &:hover {
       color: $md-link-color;
       text-decoration: none;
@@ -330,7 +322,7 @@
   margin-left: 5px;
   a {
-    color: $gl-placeholder-color;
+    color: #8c8c8c;
   }
 }

app/assets/stylesheets/pages/labels.scss

@@ -115,13 +115,6 @@
   }
 }
-.draggable-handler {
-  display: inline-block;
-  opacity: 0;
-  transition: opacity .3s;
-  color: $gray-darkest;
-}
-
 .prioritized-labels {
   margin-bottom: 30px;
@@ -129,13 +122,6 @@
     display: none;
     color: $gray-light;
   }
-
-  li:hover {
-    .draggable-handler {
-      display: inline-block;
-      opacity: 1;
-    }
-  }
 }
 .other-labels {

app/assets/stylesheets/pages/merge_requests.scss

@@ -313,13 +313,3 @@
     }
   }
 }
-
-.merged-buttons {
-  .btn {
-    float: left;
-
-    &:not(:last-child) {
-      margin-right: 10px;
-    }
-  }
-}

app/assets/stylesheets/pages/notes.scss

@@ -139,12 +139,6 @@ ul.notes {
       @media (min-width: $screen-sm-min) {
         padding-right: 0;
       }
-
-      @media (max-width: $screen-xs-min) {
-        .inline {
-          display: block;
-        }
-      }
     }
     .note-emoji-button {
@@ -264,11 +258,7 @@ ul.notes {
   position: absolute;
   right: 0;
   top: 0;
-
-  .note-action-button {
-    margin-left: 10px;
-  }
-
+  
   @media (min-width: $screen-sm-min) {
     position: relative;
   }

app/assets/stylesheets/pages/projects.scss

@@ -5,12 +5,10 @@
     font-weight: normal;
   }
 }
-
 .no-ssh-key-message, .project-limit-message {
   background-color: #f28d35;
   margin-bottom: 0;
 }
-
 .new_project,
 .edit-project {
   fieldset.features {
@@ -20,6 +18,13 @@
   }
 }
+.project-name-holder {
+  .help-inline {
+    vertical-align: top;
+    padding: 7px;
+  }
+}
+
 .project-home-panel {
   background: $white-light;
   text-align: left;
@@ -224,20 +229,13 @@
     right: 16px;
     bottom: 0;
-    @media (max-width: $screen-lg-min) {
-      top: 0;
+    .btn {
+      padding: 3px 10px;
+      background-color: $background-color;
     }
-    .access-request-button {
-      position: absolute;
-      right: 0;
-      bottom: 61px;
-
-      @media (max-width: $screen-lg-min) {
-        position: relative;
-        bottom: 0;
-        margin-right: 10px;
-      }
+    @media (max-width: 1304px) {
+      top: 0;
     }
   }
@@ -288,6 +286,10 @@
   color: #555;
 }
+.project_member_row form {
+  margin: 0;
+}
+
 .transfer-project .select2-container {
   min-width: 200px;
 }
@@ -371,7 +373,6 @@ a.deploy-project-label {
 .project-import .btn {
   float: left;
-  margin-bottom: 10px;
   margin-right: 10px;
 }

app/assets/stylesheets/pages/tree.scss

@@ -101,7 +101,7 @@
   margin: 0;
   .commit {
-    padding: 0 0 0 55px;
+    padding: 0;
     .commit-row-title {
       .commit-row-message {
@@ -129,6 +129,4 @@
 .tree-controls {
   float: right;
   margin-top: 11px;
-  position: relative;
-  z-index: 2;
 }

app/controllers/autocomplete_controller.rb

@@ -35,7 +35,6 @@ class AutocompleteController < ApplicationController
     project = Project.find_by_id(params[:project_id])
     projects = current_user.authorized_projects
-    projects = projects.search(params[:search]) if params[:search].present?
     projects = projects.select do |project|
       current_user.can?(:admin_issue, project)
     end

app/controllers/concerns/membership_actions.rb

-module MembershipActions
-  extend ActiveSupport::Concern
-  include MembersHelper
-
-  def request_access
-    membershipable.request_access(current_user)
-
-    redirect_to polymorphic_path(membershipable),
-                notice: 'Your request for access has been queued for review.'
-  end
-
-  def approve_access_request
-    @member = membershipable.members.request.find(params[:id])
-
-    return render_403 unless can?(current_user, action_member_permission(:update, @member), @member)
-
-    @member.accept_request
-
-    redirect_to polymorphic_url([membershipable, :members])
-  end
-
-  def leave
-    @member = membershipable.members.find_by(user_id: current_user)
-    return render_403 unless @member
-
-    source_type = @member.real_source_type.humanize(capitalize: false)
-
-    if can?(current_user, action_member_permission(:destroy, @member), @member)
-      notice =
-        if @member.request?
-          "Your access request to the #{source_type} has been withdrawn."
-        else
-          "You left the \"#{@member.source.human_name}\" #{source_type}."
-        end
-      @member.destroy
-
-      redirect_to [:dashboard, @member.real_source_type.tableize], notice: notice
-    else
-      if cannot_leave?
-        alert = "You can not leave the \"#{@member.source.human_name}\" #{source_type}."
-        alert << " Transfer or delete the #{source_type}."
-        redirect_to polymorphic_url(membershipable), alert: alert
-      else
-        render_403
-      end
-    end
-  end
-
-  protected
-
-  def membershipable
-    raise NotImplementedError
-  end
-
-  def cannot_leave?
-    raise NotImplementedError
-  end
-end

app/controllers/groups/group_members_controller.rb

 class Groups::GroupMembersController < Groups::ApplicationController
-  include MembershipActions
-
   # Authorize
-  before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
+  before_action :authorize_admin_group_member!, except: [:index, :leave]
   def index
     @project = @group.projects.find(params[:project_id]) if params[:project_id]
     @members = @group.group_members
-    @members = @members.non_pending unless can?(current_user, :admin_group, @group)
+    @members = @members.non_invite unless can?(current_user, :admin_group, @group)
     if params[:search].present?
       users = @group.users.search(params[:search]).to_a
@@ -60,16 +58,25 @@ class Groups::GroupMembersController < Groups::ApplicationController
     end
   end
-  protected
-  def member_params
-    params.require(:group_member).permit(:access_level, :user_id)
+  def leave
+    @group_member = @group.group_members.find_by(user_id: current_user)
+    if can?(current_user, :destroy_group_member, @group_member)
+      @group_member.destroy
+
+      redirect_to(dashboard_groups_path, notice: "You left #{group.name} group.")
+    else
+      if @group.last_owner?(current_user)
+        redirect_to(dashboard_groups_path, alert: "You can not leave #{group.name} group because you're the last owner. Transfer or delete the group.")
+      else
+        return render_403
+      end
+    end
   end
-  # MembershipActions concern
-  alias_method :membershipable, :group
-  def cannot_leave?
-    @group.last_owner?(current_user)
+  protected
+  def member_params
+    params.require(:group_member).permit(:access_level, :user_id)
   end
 end

app/controllers/jwt_controller.rb

@@ -42,7 +42,7 @@ class JwtController < ApplicationController
   end
   def authenticate_user(login, password)
-    user = Gitlab::Auth.find_with_user_password(login, password)
+    user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
     Gitlab::Auth.rate_limit!(request.ip, success: user.present?, login: login)
     user
   end

app/controllers/profiles/notifications_controller.rb

 class Profiles::NotificationsController < Profiles::ApplicationController
   def show
-    @user                        = current_user
-    @group_notifications         = current_user.notification_settings.for_groups
-    @project_notifications       = current_user.notification_settings.for_projects
-    @global_notification_setting = current_user.global_notification_setting
+    @user = current_user
+    @group_notifications = current_user.notification_settings.for_groups
+    @project_notifications = current_user.notification_settings.for_projects
   end
   def update
-    if current_user.update_attributes(user_params) && update_notification_settings
+    if current_user.update_attributes(user_params)
       flash[:notice] = "Notification settings saved"
     else
       flash[:alert] = "Failed to save new settings"
@@ -17,18 +16,6 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
   def user_params
-    params.require(:user).permit(:notification_email)
-  end
-
-  def global_notification_setting_params
-    params.require(:global_notification_setting).permit(:level)
-  end
-
-  private
-
-  def update_notification_settings
-    return true unless global_notification_setting_params
-
-    current_user.global_notification_setting.update_attributes(global_notification_setting_params)
+    params.require(:user).permit(:notification_email, :notification_level)
   end
 end

app/controllers/projects/artifacts_controller.rb

 class Projects::ArtifactsController < Projects::ApplicationController
   layout 'project'
   before_action :authorize_read_build!
-  before_action :authorize_update_build!, only: [:keep]
-  before_action :validate_artifacts!
   def download
     unless artifacts_file.file_storage?
       return redirect_to artifacts_file.url
     end
+    unless artifacts_file.exists?
+      return render_404
+    end
+
     send_file artifacts_file.path, disposition: 'attachment'
   end
   def browse
+    return render_404 unless build.artifacts?
+
     directory = params[:path] ? "#{params[:path]}/" : ''
     @entry = build.artifacts_metadata_entry(directory)
@@ -30,17 +34,8 @@ class Projects::ArtifactsController < Projects::ApplicationController
     end
   end
-  def keep
-    build.keep_artifacts!
-    redirect_to namespace_project_build_path(project.namespace, project, build)
-  end
-
   private
-  def validate_artifacts!
-    render_404 unless build.artifacts?
-  end
-
   def build
     @build ||= project.builds.find_by!(id: params[:build_id])
   end

app/controllers/projects/builds_controller.rb

@@ -51,7 +51,7 @@ class Projects::BuildsController < Projects::ApplicationController
       return render_404
     end
-    build = Ci::Build.retry(@build, current_user)
+    build = Ci::Build.retry(@build)
     redirect_to build_path(build)
   end

app/controllers/projects/commit_controller.rb

@@ -46,7 +46,7 @@ class Projects::CommitController < Projects::ApplicationController
   def retry_builds
     ci_builds.latest.failed.each do |build|
       if build.retryable?
-        Ci::Build.retry(build, current_user)
+        Ci::Build.retry(build)
       end
     end

app/controllers/projects/environments_controller.rb

-class Projects::EnvironmentsController < Projects::ApplicationController
-  layout 'project'
-  before_action :authorize_read_environment!
-  before_action :authorize_create_environment!, only: [:new, :create]
-  before_action :authorize_update_environment!, only: [:destroy]
-  before_action :environment, only: [:show, :destroy]
-
-  def index
-    @environments = project.environments
-  end
-
-  def show
-    @deployments = environment.deployments.order(id: :desc).page(params[:page])
-  end
-
-  def new
-    @environment = project.environments.new
-  end
-
-  def create
-    @environment = project.environments.create(create_params)
-
-    if @environment.persisted?
-      redirect_to namespace_project_environment_path(project.namespace, project, @environment)
-    else
-      render 'new'
-    end
-  end
-
-  def destroy
-    if @environment.destroy
-      flash[:notice] = 'Environment was successfully removed.'
-    else
-      flash[:alert] = 'Failed to remove environment.'
-    end
-
-    redirect_to namespace_project_environments_path(project.namespace, project)
-  end
-
-  private
-
-  def create_params
-    params.require(:environment).permit(:name)
-  end
-
-  def environment
-    @environment ||= project.environments.find(params[:id])
-  end
-end

app/controllers/projects/git_http_controller.rb

@@ -43,7 +43,7 @@ class Projects::GitHttpController < Projects::ApplicationController
     return if project && project.public? && upload_pack?
     authenticate_or_request_with_http_basic do |login, password|
-      auth_result = Gitlab::Auth.find_for_git_client(login, password, project: project, ip: request.ip)
+      auth_result = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
       if auth_result.type == :ci && upload_pack?
         @ci = true

app/controllers/projects/merge_requests_controller.rb

@@ -204,19 +204,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request.update(merge_error: nil)
-    if params[:merge_when_build_succeeds].present? 
-      if @merge_request.pipeline && @merge_request.pipeline.active?
-        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
-                                                        .execute(@merge_request)
-        @status = :merge_when_build_succeeds
-      elsif @merge_request.pipeline.success?
-        # This can be triggered when a user clicks the auto merge button while
-        # the tests finish at about the same time
-        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
-        @status = :success
-      else
-        @status = :failed
-      end
+    if params[:merge_when_build_succeeds].present? && @merge_request.pipeline && @merge_request.pipeline.active?
+      MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
+        .execute(@merge_request)
+      @status = :merge_when_build_succeeds
     else
       MergeWorker.perform_async(@merge_request.id, current_user.id, params)
       @status = :success

app/controllers/projects/pipelines_controller.rb

@@ -32,7 +32,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
   def retry
-    pipeline.retry_failed(current_user)
+    pipeline.retry_failed
     redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
   end

app/controllers/projects/project_members_controller.rb

 class Projects::ProjectMembersController < Projects::ApplicationController
-  include MembershipActions
-
   # Authorize
-  before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
+  before_action :authorize_admin_project_member!, except: [:leave, :index]
   def index
     @project_members = @project.project_members
-    @project_members = @project_members.non_pending unless can?(current_user, :admin_project, @project)
+    @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
     if params[:search].present?
       users = @project.users.search(params[:search]).to_a
@@ -16,10 +14,9 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     @project_members = @project_members.order('access_level DESC')
     @group = @project.group
-
     if @group
       @group_members = @group.group_members
-      @group_members = @group_members.non_pending unless can?(current_user, :admin_group, @group)
+      @group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
       if params[:search].present?
         users = @group.users.search(params[:search]).to_a
@@ -76,6 +73,26 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     end
   end
+  def leave
+    @project_member = @project.project_members.find_by(user_id: current_user)
+
+    if can?(current_user, :destroy_project_member, @project_member)
+      @project_member.destroy
+
+      respond_to do |format|
+        format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
+        format.js { head :ok }
+      end
+    else
+      if current_user == @project.owner
+        message = 'You can not leave your own project. Transfer or delete the project.'
+        redirect_back_or_default(default: { action: 'index' }, options: { alert: message })
+      else
+        render_403
+      end
+    end
+  end
+
   def apply_import
     source_project = Project.find(params[:source_project_id])
@@ -95,11 +112,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   def member_params
     params.require(:project_member).permit(:user_id, :access_level)
   end
-
-  # MembershipActions concern
-  alias_method :membershipable, :project
-
-  def cannot_leave?
-    current_user == @project.owner
-  end
 end

app/controllers/projects/todos_controller.rb

-class Projects::TodosController < Projects::ApplicationController
-  def create
-    todos = TodoService.new.mark_todo(issuable, current_user)
-
-    render json: {
-      todo: todos,
-      count: current_user.todos.pending.count,
-    }
-  end
-
-  def update
-    current_user.todos.find_by_id(params[:id]).update(state: :done)
-
-    render json: {
-      count: current_user.todos.pending.count,
-    }
-  end
-
-  private
-
-  def issuable
-    @issuable ||= begin
-      case params[:issuable_type]
-      when "issue"
-        @project.issues.find(params[:issuable_id])
-      when "merge_request"
-        @project.merge_requests.find(params[:issuable_id])
-      end
-    end
-  end
-end