Revert "squashed merge and fixed conflicts"

This reverts commit 13e37a3e.

app/controllers/projects/wikis_controller.rb

@@ -16,9 +16,6 @@ class Projects::WikisController < Projects::ApplicationController
     if @page
       render 'show'
     elsif file = @project_wiki.find_file(params[:id], params[:version_id])
-      response.headers['Content-Security-Policy'] = "default-src 'none'"
-      response.headers['X-Content-Security-Policy'] = "default-src 'none'"
-
       if file.on_disk?
         send_file file.on_disk_path, disposition: 'inline'
       else

app/controllers/sessions_controller.rb

@@ -40,7 +40,7 @@ class SessionsController < Devise::SessionsController
   # Handle an "initial setup" state, where there's only one user, it's an admin,
   # and they require a password change.
   def check_initial_setup
-    return unless User.limit(2).count == 1 # Count as much 2 to know if we have exactly one
+    return unless User.count == 1
     user = User.admins.last

app/finders/notes_finder.rb

@@ -12,7 +12,7 @@ class NotesFinder
       when "commit"
         project.notes.for_commit_id(target_id).non_diff_notes
       when "issue"
-        project.issues.visible_to_user(current_user).find(target_id).notes.inc_author
+        project.issues.find(target_id).notes.inc_author
       when "merge_request"
         project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
       when "snippet", "project_snippet"

app/finders/snippets_finder.rb

@@ -51,7 +51,7 @@ class SnippetsFinder
     snippets = project.snippets.fresh
     if current_user
-      if project.team.member?(current_user) || current_user.admin?
+      if project.team.member?(current_user.id) || current_user.admin?
         snippets
       else
         snippets.public_and_internal

app/finders/todos_finder.rb

@@ -36,7 +36,7 @@ class TodosFinder
   private
   def action_id?
-    action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED, Todo::MARKED].include?(action_id.to_i)
+    action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED].include?(action_id.to_i)
   end
   def action_id

app/helpers/blob_helper.rb

@@ -116,7 +116,7 @@ module BlobHelper
   end
   def blob_text_viewable?(blob)
-    blob && blob.text? && !blob.lfs_pointer? && !blob.only_display_raw?
+    blob && blob.text? && !blob.lfs_pointer?
   end
   def blob_size(blob)

app/helpers/branches_helper.rb

@@ -14,8 +14,4 @@ module BranchesHelper
     ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch_name)
   end
-
-  def project_branches
-    options_for_select(@project.repository.branch_names, @project.default_branch)
-  end
 end

app/helpers/button_helper.rb

@@ -17,15 +17,7 @@ module ButtonHelper
   def clipboard_button(data = {})
     content_tag :button,
       icon('clipboard'),
-      class: "btn",
-      data: data,
-      type: :button
-  end
-
-  def clipboard_button_with_class(data = {}, css_class: 'btn-clipboard')
-    content_tag :button,
-      icon('clipboard'),
-      class: "btn #{css_class}",
+      class: 'btn btn-clipboard',
       data: data,
       type: :button
   end

app/helpers/ci_status_helper.rb

@@ -38,10 +38,10 @@ module CiStatusHelper
     icon(icon_name + ' fw')
   end
-  def render_commit_status(commit, tooltip_placement: 'auto left', cssclass: '')
+  def render_commit_status(commit, tooltip_placement: 'auto left')
     project = commit.project
     path = builds_namespace_project_commit_path(project.namespace, project, commit)
-    render_status_with_link('commit', commit.status, path, tooltip_placement, cssclass: cssclass)
+    render_status_with_link('commit', commit.status, path, tooltip_placement)
   end
   def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
@@ -57,10 +57,10 @@ module CiStatusHelper
   private
-  def render_status_with_link(type, status, path, tooltip_placement, cssclass: '')
+  def render_status_with_link(type, status, path, tooltip_placement)
     link_to ci_icon_for_status(status),
             path,
-            class: "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}",
+            class: "ci-status-link ci-status-icon-#{status.dasherize}",
             title: "#{type.titleize}: #{ci_label_for_status(status)}",
             data: { toggle: 'tooltip', placement: tooltip_placement }
   end

app/helpers/commits_helper.rb

@@ -16,16 +16,6 @@ module CommitsHelper
     commit_person_link(commit, options.merge(source: :committer))
   end
-  def commit_author_avatar(commit, options = {})
-    options = options.merge(source: :author)
-    user = commit.send(options[:source])
-
-    source_email = clean(commit.send "#{options[:source]}_email".to_sym)
-    person_email = user.try(:email) || source_email
-
-    image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]} hidden-xs", width: options[:size], alt: "")
-  end
-
   def image_diff_class(diff)
     if diff.deleted_file
       "deleted"
@@ -112,24 +102,24 @@ module CommitsHelper
     if current_controller?(:projects, :commits)
       if @repo.blob_at(commit.id, @path)
         return link_to(
-          "Browse File",
+          "Browse File »",
           namespace_project_blob_path(project.namespace, project,
                                       tree_join(commit.id, @path)),
-          class: "btn btn-default"
+          class: "pull-right"
         )
       elsif @path.present?
         return link_to(
-          "Browse Directory",
+          "Browse Directory »",
           namespace_project_tree_path(project.namespace, project,
                                       tree_join(commit.id, @path)),
-          class: "btn btn-default"
+          class: "pull-right"
         )
       end
     end
     link_to(
       "Browse Files",
       namespace_project_tree_path(project.namespace, project, commit),
-      class: "btn btn-default"
+      class: "pull-right"
     )
   end
@@ -139,7 +129,7 @@ module CommitsHelper
     tooltip = "Revert this #{commit.change_type_title} in a new merge request" if has_tooltip
     if can_collaborate_with_project?
-      btn_class = "btn btn-warning btn-#{btn_class}" unless btn_class.nil?
+      btn_class = "btn btn-grouped btn-close btn-#{btn_class}" unless btn_class.nil?
       link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
     elsif can?(current_user, :fork_project, @project)
       continue_params = {
@@ -151,7 +141,7 @@ module CommitsHelper
         namespace_key: current_user.namespace.id,
         continue: continue_params)
-      btn_class = "btn btn-grouped btn-warning" unless btn_class.nil?
+      btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
       link_to 'Revert', fork_path, class: btn_class, method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
     end
@@ -163,7 +153,7 @@ module CommitsHelper
     tooltip = "Cherry-pick this #{commit.change_type_title} in a new merge request"
     if can_collaborate_with_project?
-      btn_class = "btn btn-default btn-#{btn_class}" unless btn_class.nil?
+      btn_class = "btn btn-default btn-grouped btn-#{btn_class}" unless btn_class.nil?
       link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
     elsif can?(current_user, :fork_project, @project)
       continue_params = {
@@ -197,10 +187,12 @@ module CommitsHelper
     source_email = clean(commit.send "#{options[:source]}_email".to_sym)
     person_name = user.try(:name) || source_name
+    person_email = user.try(:email) || source_email
     text =
       if options[:avatar]
-        %Q{<span class="commit-#{options[:source]}-name">#{person_name}</span>}
+        avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
+        %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{person_name}</span>}
       else
         person_name
       end

app/helpers/diff_helper.rb

@@ -135,11 +135,6 @@ module DiffHelper
     toggle_whitespace_link(url, options)
   end
-  def diff_compare_whitespace_link(project, from, to, options)
-    url = namespace_project_compare_path(project.namespace, project, from, to, params_with_whitespace)
-    toggle_whitespace_link(url, options)
-  end
-
   private
   def hide_whitespace?

app/helpers/gitlab_routing_helper.rb

@@ -13,23 +13,10 @@
 #   merge_request_path(merge_request)
 #
 module GitlabRoutingHelper
-  # Project
   def project_path(project, *args)
     namespace_project_path(project.namespace, project, *args)
   end
-  def project_url(project, *args)
-    namespace_project_url(project.namespace, project, *args)
-  end
-
-  def edit_project_path(project, *args)
-    edit_namespace_project_path(project.namespace, project, *args)
-  end
-
-  def edit_project_url(project, *args)
-    edit_namespace_project_url(project.namespace, project, *args)
-  end
-
   def project_files_path(project, *args)
     namespace_project_tree_path(project.namespace, project, @ref || project.repository.root_ref)
   end
@@ -42,10 +29,6 @@ module GitlabRoutingHelper
     namespace_project_pipelines_path(project.namespace, project, *args)
   end
-  def project_environments_path(project, *args)
-    namespace_project_environments_path(project.namespace, project, *args)
-  end
-
   def project_builds_path(project, *args)
     namespace_project_builds_path(project.namespace, project, *args)
   end
@@ -58,6 +41,10 @@ module GitlabRoutingHelper
     activity_namespace_project_path(project.namespace, project, *args)
   end
+  def edit_project_path(project, *args)
+    edit_namespace_project_path(project.namespace, project, *args)
+  end
+
   def runners_path(project, *args)
     namespace_project_runners_path(project.namespace, project, *args)
   end
@@ -78,6 +65,14 @@ module GitlabRoutingHelper
     namespace_project_milestone_path(entity.project.namespace, entity.project, entity, *args)
   end
+  def project_url(project, *args)
+    namespace_project_url(project.namespace, project, *args)
+  end
+
+  def edit_project_url(project, *args)
+    edit_namespace_project_url(project.namespace, project, *args)
+  end
+
   def issue_url(entity, *args)
     namespace_project_issue_url(entity.project.namespace, entity.project, entity, *args)
   end
@@ -97,56 +92,4 @@ module GitlabRoutingHelper
       toggle_subscription_namespace_project_merge_request_path(entity.project.namespace, entity.project, entity)
     end
   end
-
-  ## Members
-  def project_members_url(project, *args)
-    namespace_project_project_members_url(project.namespace, project)
-  end
-
-  def project_member_path(project_member, *args)
-    namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
-  end
-
-  def request_access_project_members_path(project, *args)
-    request_access_namespace_project_project_members_path(project.namespace, project)
-  end
-
-  def leave_project_members_path(project, *args)
-    leave_namespace_project_project_members_path(project.namespace, project)
-  end
-
-  def approve_access_request_project_member_path(project_member, *args)
-    approve_access_request_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
-  end
-
-  def resend_invite_project_member_path(project_member, *args)
-    resend_invite_namespace_project_project_member_path(project_member.source.namespace, project_member.source, project_member)
-  end
-
-  # Groups
-
-  ## Members
-  def group_members_url(group, *args)
-    group_group_members_url(group, *args)
-  end
-
-  def group_member_path(group_member, *args)
-    group_group_member_path(group_member.source, group_member)
-  end
-
-  def request_access_group_members_path(group, *args)
-    request_access_group_group_members_path(group)
-  end
-
-  def leave_group_members_path(group, *args)
-    leave_group_group_members_path(group)
-  end
-
-  def approve_access_request_group_member_path(group_member, *args)
-    approve_access_request_group_group_member_path(group_member.source, group_member)
-  end
-
-  def resend_invite_group_member_path(group_member, *args)
-    resend_invite_group_group_member_path(group_member.source, group_member)
-  end
 end

app/helpers/groups_helper.rb

 module GroupsHelper
+  def remove_user_from_group_message(group, member)
+    if member.user
+      "Are you sure you want to remove \"#{member.user.name}\" from \"#{group.name}\"?"
+    else
+      "Are you sure you want to revoke the invitation for \"#{member.invite_email}\" to join \"#{group.name}\"?"
+    end
+  end
+
+  def leave_group_message(group)
+    "Are you sure you want to leave \"#{group}\" group?"
+  end
+
+  def should_user_see_group_roles?(user, group)
+    if user
+      user.is_admin? || group.members.exists?(user_id: user.id)
+    else
+      false
+    end
+  end
+
   def can_change_group_visibility_level?(group)
     can?(current_user, :change_visibility_level, group)
   end

app/helpers/issuables_helper.rb

@@ -67,12 +67,6 @@ module IssuablesHelper
     end
   end
-  def has_todo(issuable)
-    unless current_user.nil?
-      current_user.todos.find_by(target_id: issuable.id, state: :pending)
-    end
-  end
-
   private
   def sidebar_gutter_collapsed?

app/helpers/members_helper.rb

-module MembersHelper
-  # Returns a `<action>_<source>_member` association, e.g.:
-  # - admin_project_member, update_project_member, destroy_project_member
-  # - admin_group_member, update_group_member, destroy_group_member
-  def action_member_permission(action, member)
-    "#{action}_#{member.type.underscore}".to_sym
-  end
-
-  def remove_member_message(member, user: nil)
-    user = current_user if defined?(current_user)
-
-    text = 'Are you sure you want to '
-    action =
-      if member.request?
-        if member.user == user
-          'withdraw your access request for'
-        else
-          "deny #{member.user.name}'s request to join"
-        end
-      elsif member.invite?
-        "revoke the invitation for #{member.invite_email} to join"
-      else
-        "remove #{member.user.name} from"
-      end
-
-    text << action << " the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?"
-  end
-
-  def remove_member_title(member)
-    text = " from #{member.real_source_type.humanize(capitalize: false)}"
-
-    text.prepend(member.request? ? 'Deny access request' : 'Remove user')
-  end
-
-  def leave_confirmation_message(member_source)
-    "Are you sure you want to leave the " \
-    "\"#{member_source.human_name}\" #{member_source.class.to_s.humanize(capitalize: false)}?"
-  end
-end

app/helpers/nav_helper.rb

@@ -12,10 +12,10 @@ module NavHelper
   end
   def page_sidebar_class
-    if pinned_nav?
-      "page-sidebar-expanded page-sidebar-pinned"
-    else
+    if nav_menu_collapsed?
       "page-sidebar-collapsed"
+    else
+      "page-sidebar-expanded"
     end
   end
@@ -36,15 +36,7 @@ module NavHelper
   end
   def nav_header_class
-    class_name = ''
-    class_name << " with-horizontal-nav" if defined?(nav) && nav
-
-    if pinned_nav?
-      class_name << " header-expanded header-pinned-nav"
-    else
-      class_name << " header-collapsed"
-    end
-
+    class_name = " with-horizontal-nav" if defined?(nav) && nav
     class_name
   end
@@ -55,8 +47,4 @@ module NavHelper
   def nav_control_class
     "nav-control" if current_user
   end
-
-  def pinned_nav?
-    cookies[:pin_nav] == 'true'
-  end
 end

app/helpers/notifications_helper.rb

@@ -61,23 +61,4 @@ module NotificationsHelper
       end
     end
   end
-
-  def notification_level_radio_buttons
-    html = ""
-
-    NotificationSetting.levels.each_key do |level|
-      level = level.to_sym
-      next if level == :global
-
-      html << content_tag(:div, class: "radio") do
-        content_tag(:label, { value: level }) do
-          radio_button_tag(:"global_notification_setting[level]", level, @global_notification_setting.level.to_sym == level) +
-          content_tag(:div, level.to_s.capitalize, class: "level-title") +
-          content_tag(:p, notification_description(level))
-        end
-      end
-    end
-
-    html.html_safe
-  end
 end

app/helpers/projects_helper.rb

 module ProjectsHelper
+  def remove_from_project_team_message(project, member)
+    if member.user
+      "You are going to remove #{member.user.name} from #{project.name} project team. Are you sure?"
+    else
+      "You are going to revoke the invitation for #{member.invite_email} to join #{project.name} project team. Are you sure?"
+    end
+  end
+
   def link_to_project(project)
     link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
       title = content_tag(:span, project.name, class: 'project-name')
@@ -41,7 +49,7 @@ module ProjectsHelper
     author_html = author_html.html_safe
     if opts[:name]
-      link_to(author_html, user_path(author), class: "author_link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
+      link_to(author_html, user_path(author), class: "author_link #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
     else
       title = opts[:title].sub(":name", sanitize(author.name))
       link_to(author_html, user_path(author), class: "author_link has-tooltip", title: title, data: { container: 'body' } ).html_safe
@@ -107,6 +115,14 @@ module ProjectsHelper
     end
   end
+  def user_max_access_in_project(user_id, project)
+    level = project.team.max_member_access(user_id)
+
+    if level
+      Gitlab::Access.options_with_owner.key(level)
+    end
+  end
+
   def license_short_name(project)
     return 'LICENSE' if project.repository.license_key.nil?
@@ -140,10 +156,6 @@ module ProjectsHelper
       nav_tabs << :container_registry
     end
-    if can?(current_user, :read_environment, project)
-      nav_tabs << :environments
-    end
-
     if can?(current_user, :admin_project, project)
       nav_tabs << :settings
     end
@@ -274,6 +286,10 @@ module ProjectsHelper
     end
   end
+  def leave_project_message(project)
+    "Are you sure you want to leave \"#{project.name}\" project?"
+  end
+
   def new_readme_path
     ref = @repository.root_ref if @repository
     ref ||= 'master'

app/helpers/time_helper.rb

@@ -20,6 +20,7 @@ module TimeHelper
     end
   end
+
   def date_from_to(from, to)
     "#{from.to_s(:short)} - #{to.to_s(:short)}"
   end

app/helpers/todos_helper.rb

@@ -12,7 +12,6 @@ module TodosHelper
     when Todo::ASSIGNED then 'assigned you'
     when Todo::MENTIONED then 'mentioned you on'
     when Todo::BUILD_FAILED then 'The build failed for your'
-    when Todo::MARKED then 'marked this as a Todo for'
     end
   end