Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.

app/assets/stylesheets/pages/pipelines.scss

-.pipelines {
-  .stage {
-    max-width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .duration, .finished_at {
-    margin: 4px 0;
-  }
-
-  .commit-title {
-    margin: 0;
-  }
-
-  .controls {
-    white-space: nowrap;
-  }
-
-  .btn {
-    margin: 4px;
-  }
-}

app/assets/stylesheets/pages/profile.scss

@@ -66,6 +66,12 @@
   }
 }
+.calendar-hint {
+  margin-top: -12px;
+  float: right;
+  font-size: 12px;
+}
+
 .profile-link-holder {
   display: inline;
@@ -128,6 +134,14 @@
   }
 }
+.change-username-title {
+  color: $gl-warning;
+}
+
+.remove-account-title {
+  color: $gl-danger;
+}
+
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;
@@ -204,7 +218,7 @@
       .btn {
         display: inline-block;
-        width: 46%;
+        width: 48%;
       }
     }
   }

app/assets/stylesheets/pages/projects.scss

@@ -7,10 +7,10 @@
 }
 .no-ssh-key-message, .project-limit-message {
   background-color: #f28d35;
-  margin-bottom: 0;
+  margin-bottom: 16px;
 }
 .new_project,
-.edit-project {
+.edit_project {
   fieldset.features {
     .control-label {
       font-weight: normal;
@@ -26,13 +26,8 @@
 }
 .project-home-panel {
-  background: $white-light;
-  text-align: left;
-  padding: 24px 0;
-
-  .container-fluid {
-    position: relative;
-  }
+  padding-bottom: 40px;
+  border-bottom: 1px solid $border-color;
   .cover-controls {
     .project-settings-dropdown {
@@ -48,55 +43,21 @@
     }
   }
-  .cover-title {
-    margin-bottom: 0;
-  }
-
-  .project-image-container {
-    @include make-sm-column(1);
-    max-width: 86px;
-    min-width: 86px;
-    padding-right: 0;
-    margin: 11px 0;
-    @media (max-width: $screen-md-max) {
-      padding-left: 0;
-      margin: 0 0 10px;
-      max-width: none;
-      min-width: none;
-
-      .avatar.s70 {
-        margin: auto;
-      }
-    }
-  }
-
-  .project-info {
-    @include make-sm-column(10);
-
-    h1 {
-      font-size: 24px;
-      font-weight: normal;
-      margin: 0;
+  .project-identicon-holder {
+    margin-bottom: 16px;
+    .avatar, .identicon {
+      margin: 0 auto;
+      float: none;
     }
-    .project-home-desc {
-      p {
-        margin: 0;
-      }
+    .identicon {
+      @include border-radius(50%);
     }
   }
-  .identicon {
-    float: left;
-    @include border-radius(50%);
-  }
-
-  .avatar {
-    float: none;
-  }
-
   .notifications-btn {
+    margin-top: -28px;
     .fa-bell {
       margin-right: 6px;
@@ -108,45 +69,28 @@
   }
   .project-repo-buttons {
-    font-size: 0;
-    .btn {
-      @include btn-gray;
-      padding: 3px 10px;
-      text-transform: none;
-      background-color: $background-color;
-      .fa {
-        color: $layout-link-gray;
+    margin-top: 20px;
+    margin-bottom: 0;
+    .count-buttons {
+      display: block;
+      margin-bottom: 20px;
+    }
+    .clone-row {
+      .split-repo-buttons,
+      .project-clone-holder {
+        display: inline-block;
       }
-      .fa-caret-down {
-        margin-left: 3px;
+      .split-repo-buttons {
+        margin: 0 12px;
       }
     }
-    .btn-group:not(:first-child):not(:last-child) > .btn {
-      border-top-right-radius: 3px;
-      border-bottom-right-radius: 3px;
-    }
-
-    form {
-      margin-left: 10px;
-    }
-
-    .count-buttons {
-      display: inline-block;
-      vertical-align: top;
-      margin-top: 16px;
-    }
-
-    .project-clone-holder {
-      display: inline-block;
-      margin-top: 16px;
-
-      input {
-        height: 29px;
-      }
+    .btn {
+      @include btn-gray;
+      text-transform: none;
     }
     .count-with-arrow {
@@ -196,18 +140,14 @@
         line-height: 13px;
         padding: $gl-vert-padding $gl-padding;
         letter-spacing: .4px;
-        padding: 7px 14px;
+        padding: 10px 14px;
         text-align: center;
         vertical-align: middle;
         touch-action: manipulation;
         cursor: pointer;
         background-image: none;
         white-space: nowrap;
-        margin: 0 10px 0 4px;
-
-        a {
-          color: inherit;
-        }
+        margin: 0 11px 0 4px;
         &:hover {
           background: #fff;
@@ -215,37 +155,13 @@
       }
     }
   }
-
-  .project-right-buttons {
-    position: absolute;
-    right: 16px;
-    bottom: 0;
-
-    .btn {
-      padding: 3px 10px;
-      background-color: $background-color;
-    }
-
-    @media (max-width: 1304px) {
-      top: 0;
-    }
-  }
-
-  @media (max-width: $screen-md-max) {
-    text-align: center;
-
-    .project-info,
-    .project-image-container {
-      width: 100%;
-    }
-  }
 }
 .split-one {
   display: inline-table;
   margin-right: 12px;
-  > a {
+  a {
     margin: -1px;
   }
 }
@@ -369,11 +285,11 @@ a.deploy-project-label {
 }
 .project-stats {
+  text-align: center;
   margin-top: $gl-padding;
   margin-bottom: 0;
-  padding: 16px 0;
-  background-color: $white-light;
-  font-size: 0;
+  padding-top: 10px;
+  padding-bottom: 4px;
   ul.nav {
     display: inline-block;
@@ -384,11 +300,12 @@ a.deploy-project-label {
   }
   .nav > li > a {
+    @include btn-default;
+    @include btn-gray;
+
     background-color: transparent;
-    margin-right: 12px;
-    padding: 0 10px;
-    font-size: 15px;
-    color: $notes-light-color;
+    border: 1px solid #f7f8fa;
+    margin-left: 12px;
   }
   li {
@@ -408,10 +325,6 @@ a.deploy-project-label {
       background-color: #f0f2f5;
     }
   }
-
-  &.row-content-block.second-block {
-    margin-top: 0;
-  }
 }
 pre.light-well {
@@ -529,14 +442,9 @@ pre.light-well {
   border-top: 0;
   .edit-project-readme {
-    z-index: 2;
+    z-index: 100;
     position: relative;
   }
-
-  .wiki h1 {
-    border-bottom: none;
-    padding: 0;
-  }
 }
 .git-clone-holder {

app/assets/stylesheets/pages/search.scss

@@ -28,7 +28,6 @@
   }
   .search-input {
-    padding-right: 20px;
     border: none;
     font-size: 14px;
     outline: none;
@@ -48,7 +47,6 @@
     display: inline-block;
     background-color: $location-badge-bg;
     vertical-align: top;
-    cursor: default;
   }
   .search-input-container {
@@ -57,7 +55,7 @@
     position: relative;
   }
-  .search-input-wrap {
+  .search-location-badge, .search-input-wrap {
     // Fallback if flexbox is not supported
     display: inline-block;
   }

app/assets/stylesheets/pages/settings.scss

@@ -12,11 +12,3 @@
   border: 1px solid $warning-message-border;
   border-radius: $border-radius-base;
 }
-
-.warning-title {
-  color: $gl-warning;
-}
-
-.danger-title {
-  color: $gl-danger;
-}

app/assets/stylesheets/pages/snippets.scss

@@ -16,6 +16,19 @@
   }
 }
+.snippet-box {
+  @include border-radius(2px);
+
+  display: block;
+  float: left;
+  padding: 0 $gl-padding;
+  font-weight: normal;
+  margin-right: 10px;
+  font-size: $gl-font-size;
+  border: 1px solid;
+  line-height: 32px;
+}
+
 .markdown-snippet-copy {
   position: fixed;
   top: -10px;
@@ -23,34 +36,3 @@
   max-height: 0;
   max-width: 0;
 }
-
-.file-holder.snippet-file-content {
-  padding-bottom: $gl-padding;
-  border-bottom: 1px solid $border-color;
-
-  .file-title {
-    padding-top: $gl-padding;
-    padding-bottom: $gl-padding;
-  }
-
-  .file-actions {
-    top: 12px;
-  }
-
-  .file-content {
-    border-left: 1px solid $border-color;
-    border-right: 1px solid $border-color;
-    border-bottom: 1px solid $border-color;
-  }
-}
-
-.snippet-title {
-  font-size: 24px;
-  font-weight: normal;
-}
-
-.snippet-actions {
-  @media (min-width: $screen-sm-min) {
-    float: right;
-  }
-}

app/assets/stylesheets/pages/todos.scss

@@ -29,17 +29,6 @@
 .todo-item {
   .todo-title {
     @include str-truncated(calc(100% - 174px));
-    overflow: visible;
-  }
-
-  .status-box {
-    margin: 0;
-    float: none;
-    display: inline-block;
-    font-weight: normal;
-    padding: 0 5px;
-    line-height: inherit;
-    font-size: 14px;
   }
   .todo-body {
@@ -87,11 +76,12 @@
 @media (max-width: $screen-xs-max) {
   .todo-item {
+    padding-left: $gl-padding;
+
     .todo-title {
       white-space: normal;
       overflow: visible;
       max-width: 100%;
-      margin-bottom: 10px;
     }
     .avatar {

app/assets/stylesheets/pages/tree.scss

@@ -15,23 +15,16 @@
     margin-bottom: 0;
     tr {
-      border-bottom: 1px solid $table-border-gray;
-      border-top: 1px solid $table-border-gray;
-
-      td, th {
+      > td, > th {
         line-height: 23px;
       }
       &:hover {
-        cursor: pointer;
-
         td {
-          background-color: $row-hover;
-          border-top: 1px solid $row-hover-border;
-          border-bottom: 1px solid $row-hover-border;
+          background: $row-hover;
         }
+        cursor: pointer;
       }
-
       &.selected {
         td {
           background: $gray-dark;

app/controllers/admin/abuse_reports_controller.rb

@@ -9,6 +9,6 @@ class Admin::AbuseReportsController < Admin::ApplicationController
     abuse_report.remove_user(deleted_by: current_user) if params[:remove_user]
     abuse_report.destroy
-    head :ok
+    render nothing: true
   end
 end

app/controllers/admin/application_settings_controller.rb

@@ -19,12 +19,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     redirect_to admin_runners_path
   end
-  def reset_health_check_token
-    @application_setting.reset_health_check_access_token!
-    flash[:notice] = 'New health check access token has been generated!'
-    redirect_to :back
-  end
-
   def clear_repository_check_states
     RepositoryCheck::ClearWorker.perform_async
@@ -59,12 +53,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
-    enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
-
-    params[:application_setting][:disabled_oauth_sign_in_sources] =
-      AuthHelper.button_based_providers.map(&:to_s) -
-      Array(enabled_oauth_sign_in_sources)
-
     params.require(:application_setting).permit(
       :default_projects_limit,
       :default_branch_protection,
@@ -106,11 +94,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :email_author_in_body,
       :repository_checks_enabled,
       :metrics_packet_size,
-      :send_user_confirmation_email,
-      :container_registry_token_expire_delay,
       restricted_visibility_levels: [],
-      import_sources: [],
-      disabled_oauth_sign_in_sources: []
+      import_sources: []
     )
   end
 end

app/controllers/admin/broadcast_messages_controller.rb

@@ -32,7 +32,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
     respond_to do |format|
       format.html { redirect_back_or_default(default: { action: 'index' }) }
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end

app/controllers/admin/health_check_controller.rb

-class Admin::HealthCheckController < Admin::ApplicationController
-  def show
-    @errors = HealthCheck::Utils.process_checks('standard')
-  end
-end

app/controllers/admin/keys_controller.rb

@@ -6,7 +6,7 @@ class Admin::KeysController < Admin::ApplicationController
     respond_to do |format|
       format.html
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end

app/controllers/admin/runners_controller.rb

@@ -9,18 +9,23 @@ class Admin::RunnersController < Admin::ApplicationController
   end
   def show
-    assign_builds_and_projects
+    @builds = @runner.builds.order('id DESC').first(30)
+    @projects =
+      if params[:search].present?
+        ::Project.search(params[:search])
+      else
+        Project.all
+      end
+    @projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
+    @projects = @projects.page(params[:page]).per(30)
   end
   def update
-    if @runner.update_attributes(runner_params)
-      respond_to do |format|
-        format.js
-        format.html { redirect_to admin_runner_path(@runner) }
-      end
-    else
-      assign_builds_and_projects
-      render 'show'
+    @runner.update_attributes(runner_params)
+
+    respond_to do |format|
+      format.js
+      format.html { redirect_to admin_runner_path(@runner) }
     end
   end
@@ -53,18 +58,6 @@ class Admin::RunnersController < Admin::ApplicationController
   end
   def runner_params
-    params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
-  end
-
-  def assign_builds_and_projects
-    @builds = runner.builds.order('id DESC').first(30)
-    @projects =
-      if params[:search].present?
-        ::Project.search(params[:search])
-      else
-        Project.all
-      end
-    @projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any?
-    @projects = @projects.page(params[:page]).per(30)
+    params.require(:runner).permit(:token, :description, :tag_list, :active)
   end
 end

app/controllers/admin/spam_logs_controller.rb

@@ -11,7 +11,7 @@ class Admin::SpamLogsController < Admin::ApplicationController
       redirect_to admin_spam_logs_path, notice: "User #{spam_log.user.username} was successfully removed."
     else
       spam_log.destroy
-      head :ok
+      render nothing: true
     end
   end
 end

app/controllers/admin/users_controller.rb

@@ -119,7 +119,6 @@ class Admin::UsersController < Admin::ApplicationController
       user_params_with_pass.merge!(
         password: params[:user][:password],
         password_confirmation: params[:user][:password_confirmation],
-        password_expires_at: Time.now
       )
     end
@@ -154,7 +153,7 @@ class Admin::UsersController < Admin::ApplicationController
     respond_to do |format|
       format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
-      format.js { head :ok }
+      format.js { render nothing: true }
     end
   end

app/controllers/application_controller.rb

@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
   end
   def check_password_expiration
-    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
+    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now  && !current_user.ldap_user?
       redirect_to new_profile_password_path and return
     end
   end
@@ -232,7 +232,7 @@ class ApplicationController < ActionController::Base
   end
   def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt])
+    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me, :otp_attempt) }
   end
   def hexdigest(string)
@@ -263,7 +263,7 @@ class ApplicationController < ActionController::Base
       # 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
+      #@filter_params[:authorized_only] = true
     end
     @filter_params

app/controllers/autocomplete_controller.rb

@@ -31,24 +31,6 @@ class AutocompleteController < ApplicationController
     render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
   end
-  def projects
-    project = Project.find_by_id(params[:project_id])
-
-    projects = current_user.authorized_projects
-    projects = projects.select do |project|
-      current_user.can?(:admin_issue, project)
-    end
-
-    no_project = {
-      id: 0,
-      name_with_namespace: 'No project',
-    }
-    projects.unshift(no_project)
-    projects.delete(project)
-
-    render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
-  end
-
   private
   def find_users

app/controllers/concerns/creates_commit.rb

@@ -122,7 +122,7 @@ module CreatesCommit
       # Merge request from fork to this project
       @mr_source_project = @tree_edit_project
       @mr_target_project = @project
-      @mr_target_branch ||= @ref
+      @mr_target_branch  ||= @ref
     end
   end
 end

app/controllers/concerns/toggle_subscription_action.rb

@@ -6,7 +6,7 @@ module ToggleSubscriptionAction
     subscribable_resource.toggle_subscription(current_user)
-    head :ok
+    render nothing: true
   end
   private