Commit 31d73135 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master'

Enable Style/EmptyLines Rubocop cop

#17478

See merge request !5013
parents d6efef0f 9e211091
...@@ -193,7 +193,7 @@ Style/EmptyLineBetweenDefs: ...@@ -193,7 +193,7 @@ Style/EmptyLineBetweenDefs:
# Don't use several empty lines in a row. # Don't use several empty lines in a row.
Style/EmptyLines: Style/EmptyLines:
Enabled: false Enabled: true
# Keep blank lines around access modifiers. # Keep blank lines around access modifiers.
Style/EmptyLinesAroundAccessModifier: Style/EmptyLinesAroundAccessModifier:
......
...@@ -22,7 +22,6 @@ class Admin::HooksController < Admin::ApplicationController ...@@ -22,7 +22,6 @@ class Admin::HooksController < Admin::ApplicationController
redirect_to admin_hooks_path redirect_to admin_hooks_path
end end
def test def test
@hook = SystemHook.find(params[:hook_id]) @hook = SystemHook.find(params[:hook_id])
data = { data = {
......
class ConfirmationsController < Devise::ConfirmationsController class ConfirmationsController < Devise::ConfirmationsController
def almost_there def almost_there
flash[:notice] = nil flash[:notice] = nil
render layout: "devise_empty" render layout: "devise_empty"
......
class Import::BaseController < ApplicationController class Import::BaseController < ApplicationController
private private
def get_or_create_namespace def get_or_create_namespace
......
...@@ -5,7 +5,6 @@ class Import::FogbugzController < Import::BaseController ...@@ -5,7 +5,6 @@ class Import::FogbugzController < Import::BaseController
rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized
def new def new
end end
def callback def callback
...@@ -22,7 +21,6 @@ class Import::FogbugzController < Import::BaseController ...@@ -22,7 +21,6 @@ class Import::FogbugzController < Import::BaseController
end end
def new_user_map def new_user_map
end end
def create_user_map def create_user_map
......
...@@ -44,5 +44,4 @@ class Import::GitoriousController < Import::BaseController ...@@ -44,5 +44,4 @@ class Import::GitoriousController < Import::BaseController
def verify_gitorious_import_enabled def verify_gitorious_import_enabled
render_404 unless gitorious_import_enabled? render_404 unless gitorious_import_enabled?
end end
end end
...@@ -3,7 +3,6 @@ class Import::GoogleCodeController < Import::BaseController ...@@ -3,7 +3,6 @@ class Import::GoogleCodeController < Import::BaseController
before_action :user_map, only: [:new_user_map, :create_user_map] before_action :user_map, only: [:new_user_map, :create_user_map]
def new def new
end end
def callback def callback
...@@ -34,7 +33,6 @@ class Import::GoogleCodeController < Import::BaseController ...@@ -34,7 +33,6 @@ class Import::GoogleCodeController < Import::BaseController
end end
def new_user_map def new_user_map
end end
def create_user_map def create_user_map
......
...@@ -5,7 +5,6 @@ class InvitesController < ApplicationController ...@@ -5,7 +5,6 @@ class InvitesController < ApplicationController
respond_to :html respond_to :html
def show def show
end end
def accept def accept
......
...@@ -76,7 +76,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -76,7 +76,6 @@ class Projects::IssuesController < Projects::ApplicationController
render json: @issue.to_json(include: [:milestone, :labels]) render json: @issue.to_json(include: [:milestone, :labels])
end end
end end
end end
def create def create
......
...@@ -7,7 +7,6 @@ class Projects::NetworkController < Projects::ApplicationController ...@@ -7,7 +7,6 @@ class Projects::NetworkController < Projects::ApplicationController
before_action :authorize_download_code! before_action :authorize_download_code!
def show def show
@url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json)) @url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json))
@commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s") @commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s")
......
...@@ -124,5 +124,4 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -124,5 +124,4 @@ class Projects::WikisController < Projects::ApplicationController
def wiki_params def wiki_params
params[:wiki].slice(:title, :content, :format, :message) params[:wiki].slice(:title, :content, :format, :message)
end end
end end
module EmailsHelper module EmailsHelper
# Google Actions # Google Actions
# https://developers.google.com/gmail/markup/reference/go-to-action # https://developers.google.com/gmail/markup/reference/go-to-action
def email_action(url) def email_action(url)
......
module IssuablesHelper module IssuablesHelper
def sidebar_gutter_toggle_icon def sidebar_gutter_toggle_icon
sidebar_gutter_collapsed? ? icon('angle-double-left') : icon('angle-double-right') sidebar_gutter_collapsed? ? icon('angle-double-left') : icon('angle-double-right')
end end
......
module SearchHelper module SearchHelper
def search_autocomplete_opts(term) def search_autocomplete_opts(term)
return unless current_user return unless current_user
......
...@@ -58,7 +58,6 @@ module Issuable ...@@ -58,7 +58,6 @@ module Issuable
scope :references_project, -> { references(:project) } scope :references_project, -> { references(:project) }
scope :non_archived, -> { join_project.where(projects: { archived: false }) } scope :non_archived, -> { join_project.where(projects: { archived: false }) }
delegate :name, delegate :name,
:email, :email,
to: :author, to: :author,
......
...@@ -15,7 +15,6 @@ class ProjectMember < Member ...@@ -15,7 +15,6 @@ class ProjectMember < Member
before_destroy :delete_member_todos before_destroy :delete_member_todos
class << self class << self
# Add users to project teams with passed access option # Add users to project teams with passed access option
# #
# access can be an integer representing a access code # access can be an integer representing a access code
......
class BugzillaService < IssueTrackerService class BugzillaService < IssueTrackerService
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
def title def title
...@@ -21,5 +20,4 @@ class BugzillaService < IssueTrackerService ...@@ -21,5 +20,4 @@ class BugzillaService < IssueTrackerService
def to_param def to_param
'bugzilla' 'bugzilla'
end end
end end
class CustomIssueTrackerService < IssueTrackerService class CustomIssueTrackerService < IssueTrackerService
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
def title def title
...@@ -31,5 +30,4 @@ class CustomIssueTrackerService < IssueTrackerService ...@@ -31,5 +30,4 @@ class CustomIssueTrackerService < IssueTrackerService
{ type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' } { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' }
] ]
end end
end end
class DroneCiService < CiService class DroneCiService < CiService
prop_accessor :drone_url, :token, :enable_ssl_verification prop_accessor :drone_url, :token, :enable_ssl_verification
validates :drone_url, presence: true, url: true, if: :activated? validates :drone_url, presence: true, url: true, if: :activated?
......
class IssueTrackerService < Service class IssueTrackerService < Service
validates :project_url, :issues_url, :new_issue_url, presence: true, url: true, if: :activated? validates :project_url, :issues_url, :new_issue_url, presence: true, url: true, if: :activated?
default_value_for :category, 'issue_tracker' default_value_for :category, 'issue_tracker'
......
...@@ -190,7 +190,6 @@ class JiraService < IssueTrackerService ...@@ -190,7 +190,6 @@ class JiraService < IssueTrackerService
end end
end end
def auth def auth
require 'base64' require 'base64'
Base64.urlsafe_encode64("#{self.username}:#{self.password}") Base64.urlsafe_encode64("#{self.username}:#{self.password}")
......
class RedmineService < IssueTrackerService class RedmineService < IssueTrackerService
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
def title def title
......
...@@ -875,7 +875,6 @@ class Repository ...@@ -875,7 +875,6 @@ class Repository
merge_base(ancestor_id, descendant_id) == ancestor_id merge_base(ancestor_id, descendant_id) == ancestor_id
end end
def search_files(query, ref) def search_files(query, ref)
offset = 2 offset = 2
args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref}) args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref})
......
...@@ -852,7 +852,6 @@ class User < ActiveRecord::Base ...@@ -852,7 +852,6 @@ class User < ActiveRecord::Base
projects.select(:id), projects.select(:id),
groups.joins(:shared_projects).select(:project_id)] groups.joins(:shared_projects).select(:project_id)]
if min_access_level if min_access_level
scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } } scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } }
relations = [relations.shift] + relations.map { |relation| relation.where(members: scope) } relations = [relations.shift] + relations.map { |relation| relation.where(members: scope) }
......
...@@ -2,7 +2,6 @@ require_relative 'base_service' ...@@ -2,7 +2,6 @@ require_relative 'base_service'
class CreateReleaseService < BaseService class CreateReleaseService < BaseService
def execute(tag_name, release_description) def execute(tag_name, release_description)
repository = project.repository repository = project.repository
existing_tag = repository.find_tag(tag_name) existing_tag = repository.find_tag(tag_name)
......
module Issues module Issues
class BaseService < ::IssuableBaseService class BaseService < ::IssuableBaseService
def hook_data(issue, action) def hook_data(issue, action)
issue_data = issue.to_hook_data(current_user) issue_data = issue.to_hook_data(current_user)
issue_url = Gitlab::UrlBuilder.build(issue) issue_url = Gitlab::UrlBuilder.build(issue)
......
module MergeRequests module MergeRequests
class BaseService < ::IssuableBaseService class BaseService < ::IssuableBaseService
def create_note(merge_request) def create_note(merge_request)
SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, merge_request.state, nil) SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
end end
......
...@@ -40,6 +40,5 @@ module MergeRequests ...@@ -40,6 +40,5 @@ module MergeRequests
error("Can't cancel the automatic merge", 406) error("Can't cancel the automatic merge", 406)
end end
end end
end end
end end
module Milestones module Milestones
class DestroyService < Milestones::BaseService class DestroyService < Milestones::BaseService
def execute(milestone) def execute(milestone)
Milestone.transaction do Milestone.transaction do
update_params = { milestone: nil } update_params = { milestone: nil }
......
module Projects module Projects
class DownloadService < BaseService class DownloadService < BaseService
WHITELIST = [ WHITELIST = [
/^[^.]+\.fogbugz.com$/ /^[^.]+\.fogbugz.com$/
] ]
......
module Projects module Projects
module ImportExport module ImportExport
class ExportService < BaseService class ExportService < BaseService
def execute(_options = {}) def execute(_options = {})
@shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work')) @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
save_all save_all
......
...@@ -293,7 +293,6 @@ class SystemNoteService ...@@ -293,7 +293,6 @@ class SystemNoteService
end end
end end
def self.cross_reference?(note_text) def self.cross_reference?(note_text)
note_text.start_with?(cross_reference_note_prefix) note_text.start_with?(cross_reference_note_prefix)
end end
......
...@@ -2,7 +2,6 @@ require_relative 'base_service' ...@@ -2,7 +2,6 @@ require_relative 'base_service'
class UpdateReleaseService < BaseService class UpdateReleaseService < BaseService
def execute(tag_name, release_description) def execute(tag_name, release_description)
repository = project.repository repository = project.repository
existing_tag = repository.find_tag(tag_name) existing_tag = repository.find_tag(tag_name)
......
module WikiPages module WikiPages
class BaseService < ::BaseService class BaseService < ::BaseService
def hook_data(page, action) def hook_data(page, action)
hook_data = { hook_data = {
object_kind: page.class.name.underscore, object_kind: page.class.name.underscore,
......
...@@ -96,7 +96,6 @@ class Settings < Settingslogic ...@@ -96,7 +96,6 @@ class Settings < Settingslogic
end end
end end
# Default settings # Default settings
Settings['ldap'] ||= Settingslogic.new({}) Settings['ldap'] ||= Settingslogic.new({})
Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
...@@ -124,7 +123,6 @@ if Settings.ldap['enabled'] || Rails.env.test? ...@@ -124,7 +123,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
end end
end end
Settings['omniauth'] ||= Settingslogic.new({}) Settings['omniauth'] ||= Settingslogic.new({})
Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil? Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil?
...@@ -218,7 +216,6 @@ Settings.gitlab['restricted_signup_domains'] ||= [] ...@@ -218,7 +216,6 @@ Settings.gitlab['restricted_signup_domains'] ||= []
Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project] Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project]
Settings.gitlab['trusted_proxies'] ||= [] Settings.gitlab['trusted_proxies'] ||= []
# #
# CI # CI
# #
...@@ -348,7 +345,6 @@ Settings.git['timeout'] ||= 10 ...@@ -348,7 +345,6 @@ Settings.git['timeout'] ||= 10
Settings['satellites'] ||= Settingslogic.new({}) Settings['satellites'] ||= Settingslogic.new({})
Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root) Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root)
# #
# Extra customization # Extra customization
# #
......
...@@ -133,7 +133,6 @@ Rails.application.routes.draw do ...@@ -133,7 +133,6 @@ Rails.application.routes.draw do
# #
resources :notification_settings, only: [:create, :update] resources :notification_settings, only: [:create, :update]
# #
# Import # Import
# #
...@@ -466,7 +465,6 @@ Rails.application.routes.draw do ...@@ -466,7 +465,6 @@ Rails.application.routes.draw do
resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except: resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except:
[:new, :create, :index], path: "/") do [:new, :create, :index], path: "/") do
member do member do
put :transfer put :transfer
delete :remove_fork delete :remove_fork
......
...@@ -49,5 +49,4 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps ...@@ -49,5 +49,4 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
step 'I redirected to Google Code import page' do step 'I redirected to Google Code import page' do
expect(current_path).to eq new_import_google_code_path expect(current_path).to eq new_import_google_code_path
end end
end end
...@@ -69,7 +69,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps ...@@ -69,7 +69,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
visit namespace_project_issues_path(public_project.namespace, public_project) visit namespace_project_issues_path(public_project.namespace, public_project)
end end
step 'I should see list of issues for "Community" project' do step 'I should see list of issues for "Community" project' do
expect(page).to have_content "Bug" expect(page).to have_content "Bug"
expect(page).to have_content public_project.name expect(page).to have_content public_project.name
...@@ -88,7 +87,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps ...@@ -88,7 +87,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
visit namespace_project_issues_path(internal_project.namespace, internal_project) visit namespace_project_issues_path(internal_project.namespace, internal_project)
end end
step 'I should see list of issues for "Internal" project' do step 'I should see list of issues for "Internal" project' do
expect(page).to have_content "Internal Bug" expect(page).to have_content "Internal Bug"
expect(page).to have_content internal_project.name expect(page).to have_content internal_project.name
...@@ -137,7 +135,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps ...@@ -137,7 +135,6 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
@public_project ||= Project.find_by!(name: 'Community') @public_project ||= Project.find_by!(name: 'Community')
end end
def internal_merge_request def internal_merge_request
@internal_merge_request ||= MergeRequest.find_by!(title: 'Feature implemented') @internal_merge_request ||= MergeRequest.find_by!(title: 'Feature implemented')
end end
......
...@@ -33,5 +33,4 @@ class Spinach::Features::ProjectArchived < Spinach::FeatureSteps ...@@ -33,5 +33,4 @@ class Spinach::Features::ProjectArchived < Spinach::FeatureSteps
When 'I set project unarchived' do When 'I set project unarchived' do
click_link "Unarchive" click_link "Unarchive"
end end
end end
...@@ -124,14 +124,12 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps ...@@ -124,14 +124,12 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end end
step 'project "Shop" has milestone "v2.2"' do step 'project "Shop" has milestone "v2.2"' do
milestone = create(:milestone, title: "v2.2", project: project) milestone = create(:milestone, title: "v2.2", project: project)
3.times { create(:issue, project: project, milestone: milestone) } 3.times { create(:issue, project: project, milestone: milestone) }
end end
step 'project "Shop" has milestone "v3.0"' do step 'project "Shop" has milestone "v3.0"' do
milestone = create(:milestone, title: "v3.0", project: project) milestone = create(:milestone, title: "v3.0", project: project)
3.times { create(:issue, project: project, milestone: milestone) } 3.times { create(:issue, project: project, milestone: milestone) }
...@@ -147,7 +145,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps ...@@ -147,7 +145,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end end
When 'I select first assignee from "Shop" project' do When 'I select first assignee from "Shop" project' do
first_assignee = project.users.first first_assignee = project.users.first
select first_assignee.name, from: "assignee_id" select first_assignee.name, from: "assignee_id"
end end
...@@ -160,7 +157,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps ...@@ -160,7 +157,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end end
step 'project "Shop" have "Release 0.4" open issue' do step 'project "Shop" have "Release 0.4" open issue' do
create(:issue, create(:issue,
title: "Release 0.4", title: "Release 0.4",
project: project, project: project,
...@@ -360,5 +356,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps ...@@ -360,5 +356,4 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
def filter_issue(text) def filter_issue(text)
fill_in 'issue_search', with: text fill_in 'issue_search', with: text
end end
end end
...@@ -66,7 +66,6 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps ...@@ -66,7 +66,6 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
expect(page).not_to have_content(".gitignore") expect(page).not_to have_content(".gitignore")
end end
def find_file(text) def find_file(text)
fill_in 'file_find', with: text fill_in 'file_find', with: text
end end
......
...@@ -189,5 +189,4 @@ module SharedIssuable ...@@ -189,5 +189,4 @@ module SharedIssuable
expect(page).to have_content content expect(page).to have_content content
end end
end end
end end
...@@ -52,5 +52,4 @@ class Spinach::Features::SnippetSearch < Spinach::FeatureSteps ...@@ -52,5 +52,4 @@ class Spinach::Features::SnippetSearch < Spinach::FeatureSteps
step 'I should not see "Personal snippet private" in results' do step 'I should not see "Personal snippet private" in results' do
expect(page).not_to have_content 'Personal snippet private' expect(page).not_to have_content 'Personal snippet private'
end end
end end
...@@ -11,7 +11,6 @@ module API ...@@ -11,7 +11,6 @@ module API
[ ":id/#{awardable_string}/:#{awardable_id_string}/award_emoji", [ ":id/#{awardable_string}/:#{awardable_id_string}/award_emoji",
":id/#{awardable_string}/:#{awardable_id_string}/notes/:note_id/award_emoji" ":id/#{awardable_string}/:#{awardable_id_string}/notes/:note_id/award_emoji"
].each do |endpoint| ].each do |endpoint|
# Get a list of project +awardable+ award emoji # Get a list of project +awardable+ award emoji
# #
# Parameters: # Parameters:
......
...@@ -40,7 +40,6 @@ module API ...@@ -40,7 +40,6 @@ module API
# PUT /projects/:id/repository/branches/:branch/protect # PUT /projects/:id/repository/branches/:branch/protect
put ':id/repository/branches/:branch/protect', put ':id/repository/branches/:branch/protect',
requirements: { branch: /.+/ } do requirements: { branch: /.+/ } do
authorize_admin_project authorize_admin_project
@branch = user_project.repository.find_branch(params[:branch]) @branch = user_project.repository.find_branch(params[:branch])
...@@ -60,7 +59,6 @@ module API ...@@ -60,7 +59,6 @@ module API
# PUT /projects/:id/repository/branches/:branch/unprotect # PUT /projects/:id/repository/branches/:branch/unprotect
put ':id/repository/branches/:branch/unprotect', put ':id/repository/branches/:branch/unprotect',
requirements: { branch: /.+/ } do requirements: { branch: /.+/ } do
authorize_admin_project authorize_admin_project
@branch = user_project.repository.find_branch(params[:branch]) @branch = user_project.repository.find_branch(params[:branch])
......
...@@ -13,7 +13,6 @@ module API ...@@ -13,7 +13,6 @@ module API
# Example Request: # Example Request:
# GET /projects/:id/builds # GET /projects/:id/builds
get ':id/builds' do get ':id/builds' do
builds = user_project.builds.order('id DESC') builds = user_project.builds.order('id DESC')
builds = filter_builds(builds, params[:scope]) builds = filter_builds(builds, params[:scope])
......
...@@ -115,7 +115,6 @@ module API ...@@ -115,7 +115,6 @@ module API
issues = IssuesFinder.new(current_user, finder_params).execute issues = IssuesFinder.new(current_user, finder_params).execute
present paginate(issues), with: Entities::Issue, current_user: current_user present paginate(issues), with: Entities::Issue, current_user: current_user
end end
end end
end end
end end
...@@ -28,7 +28,6 @@ module API ...@@ -28,7 +28,6 @@ module API
present @hook, with: Entities::ProjectHook present @hook, with: Entities::ProjectHook
end end
# Add hook to project # Add hook to project
# #
# Parameters: # Parameters:
......
...@@ -4,7 +4,6 @@ module API ...@@ -4,7 +4,6 @@ module API
before { authenticate! } before { authenticate! }
resource :projects do resource :projects do
# Get a project team members # Get a project team members
# #
# Parameters: # Parameters:
......
...@@ -341,7 +341,6 @@ module API ...@@ -341,7 +341,6 @@ module API
else else
not_found!("Source Project") not_found!("Source Project")
end end
end end
# Remove a forked_from relationship # Remove a forked_from relationship
...@@ -418,7 +417,6 @@ module API ...@@ -418,7 +417,6 @@ module API
present paginate(projects), with: Entities::Project present paginate(projects), with: Entities::Project
end end
# Get a users list # Get a users list
# #
# Example Request: # Example Request:
......
...@@ -4,7 +4,6 @@ module API ...@@ -4,7 +4,6 @@ module API
before { authenticate! } before { authenticate! }
before { authorize_admin_project } before { authorize_admin_project }
resource :projects do resource :projects do
# Set <service_slug> service for project # Set <service_slug> service for project
# #
......
...@@ -8,7 +8,6 @@ module Banzai ...@@ -8,7 +8,6 @@ module Banzai
# of the anchor, and then replace the img with the link-wrapped version. # of the anchor, and then replace the img with the link-wrapped version.
def call def call
doc.xpath('descendant-or-self::img[not(ancestor::a)]').each do |img| doc.xpath('descendant-or-self::img[not(ancestor::a)]').each do |img|
div = doc.document.create_element( div = doc.document.create_element(
'div', 'div',
class: 'image-container' class: 'image-container'
......
...@@ -8,7 +8,6 @@ module Banzai ...@@ -8,7 +8,6 @@ module Banzai
# Context options: # Context options:
# :project_wiki # :project_wiki
class WikiLinkFilter < HTML::Pipeline::Filter class WikiLinkFilter < HTML::Pipeline::Filter
def call def call
return doc unless project_wiki? return doc unless project_wiki?
......
module Banzai module Banzai
module Pipeline module Pipeline
class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline) class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
end end
end end
end end
...@@ -13,7 +13,6 @@ module Ci ...@@ -13,7 +13,6 @@ module Ci
collect collect
end end
def push(from, to, format) def push(from, to, format)
@labels << from.strftime(format) @labels << from.strftime(format)
@total << project.builds. @total << project.builds.
......
# Read about interceptors in http://guides.rubyonrails.org/action_mailer_basics.html#intercepting-emails # Read about interceptors in http://guides.rubyonrails.org/action_mailer_basics.html#intercepting-emails
class DisableEmailInterceptor class DisableEmailInterceptor
def self.delivering_email(message) def self.delivering_email(message)
message.perform_deliveries = false message.perform_deliveries = false
Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}" Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}"
......
...@@ -4,7 +4,6 @@ module Gitlab ...@@ -4,7 +4,6 @@ module Gitlab
# Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters # Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters
# the resulting HTML through HTML pipeline filters. # the resulting HTML through HTML pipeline filters.
module Asciidoc module Asciidoc
DEFAULT_ADOC_ATTRS = [ DEFAULT_ADOC_ATTRS = [
'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=gitlab', 'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=gitlab',
'env-gitlab', 'source-highlighter=html-pipeline' 'env-gitlab', 'source-highlighter=html-pipeline'
......
...@@ -8,7 +8,6 @@ module Grack ...@@ -8,7 +8,6 @@ module Grack
end end
class Auth < Rack::Auth::Basic class Auth < Rack::Auth::Basic
attr_accessor :user, :project, :env attr_accessor :user, :project, :env
def call(env) def call(env)
......
...@@ -40,7 +40,6 @@ module Gitlab ...@@ -40,7 +40,6 @@ module Gitlab
line_obj_index += 1 line_obj_index += 1
end end
case line[0] case line[0]
when "+" when "+"
line_new += 1 line_new += 1
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class Importer class Importer
def initialize(project) def initialize(project)
@archive_file = project.import_source @archive_file = project.import_source
@current_user = project.creator @current_user = project.creator
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class MembersMapper class MembersMapper
attr_reader :missing_author_ids attr_reader :missing_author_ids
def initialize(exported_members:, user:, project:) def initialize(exported_members:, user:, project:)
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class ProjectCreator class ProjectCreator
def initialize(namespace_id, current_user, file, project_path) def initialize(namespace_id, current_user, file, project_path)
@namespace_id = namespace_id @namespace_id = namespace_id
@current_user = current_user @current_user = current_user
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class ProjectTreeRestorer class ProjectTreeRestorer
def initialize(user:, shared:, project:) def initialize(user:, shared:, project:)
@path = File.join(shared.export_path, 'project.json') @path = File.join(shared.export_path, 'project.json')
@user = user @user = user
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class Reader class Reader
attr_reader :tree attr_reader :tree
def initialize(shared:) def initialize(shared:)
...@@ -55,7 +54,6 @@ module Gitlab ...@@ -55,7 +54,6 @@ module Gitlab
@json_config_hash @json_config_hash
end end
# If the model is a hash, process the sub_models, which could also be hashes # If the model is a hash, process the sub_models, which could also be hashes
# If there is a list, add to an existing array, otherwise use hash syntax # If there is a list, add to an existing array, otherwise use hash syntax
# +current_key+ main model that will be a key in the hash # +current_key+ main model that will be a key in the hash
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class RelationFactory class RelationFactory
OVERRIDES = { snippets: :project_snippets, OVERRIDES = { snippets: :project_snippets,
pipelines: 'Ci::Pipeline', pipelines: 'Ci::Pipeline',
statuses: 'commit_status', statuses: 'commit_status',
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class Shared class Shared
attr_reader :errors, :opts attr_reader :errors, :opts
def initialize(opts) def initialize(opts)
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class UploadsSaver class UploadsSaver
def initialize(project:, shared:) def initialize(project:, shared:)
@project = project @project = project
@shared = shared @shared = shared
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class VersionChecker class VersionChecker
def self.check!(*args) def self.check!(*args)
new(*args).check! new(*args).check!
end end
......
module Gitlab module Gitlab
module ImportExport module ImportExport
class VersionSaver class VersionSaver
def initialize(shared:) def initialize(shared:)
@shared = shared @shared = shared
end end
......
...@@ -24,8 +24,6 @@ module Gitlab ...@@ -24,8 +24,6 @@ module Gitlab
'GitLab export' => 'gitlab_project' 'GitLab export' => 'gitlab_project'
} }
end end
end end
end end
end end
module Gitlab module Gitlab
module Lfs module Lfs
class Response class Response
def initialize(project, user, ci, request) def initialize(project, user, ci, request)
@origin_project = project @origin_project = project
@project = storage_project(project) @project = storage_project(project)
......
module Gitlab module Gitlab
# Parser/renderer for markups without other special support code. # Parser/renderer for markups without other special support code.
module OtherMarkup module OtherMarkup
# Public: Converts the provided markup into HTML. # Public: Converts the provided markup into HTML.
# #
# input - the source text in a markup format # input - the source text in a markup format
......
...@@ -13,7 +13,6 @@ module Gitlab ...@@ -13,7 +13,6 @@ module Gitlab
"Cannot start with '-' or end in '.'." \ "Cannot start with '-' or end in '.'." \
end end
def namespace_name_regex def namespace_name_regex
@namespace_name_regex ||= /\A[\p{Alnum}\p{Pd}_\. ]*\z/.freeze @namespace_name_regex ||= /\A[\p{Alnum}\p{Pd}_\. ]*\z/.freeze
end end
...@@ -22,7 +21,6 @@ module Gitlab ...@@ -22,7 +21,6 @@ module Gitlab
"can contain only letters, digits, '_', '.', dash and space." "can contain only letters, digits, '_', '.', dash and space."
end end
def project_name_regex def project_name_regex
@project_name_regex ||= /\A[\p{Alnum}_][\p{Alnum}\p{Pd}_\. ]*\z/.freeze @project_name_regex ||= /\A[\p{Alnum}_][\p{Alnum}\p{Pd}_\. ]*\z/.freeze
end end
...@@ -32,7 +30,6 @@ module Gitlab ...@@ -32,7 +30,6 @@ module Gitlab
"It must start with letter, digit or '_'." "It must start with letter, digit or '_'."
end end
def project_path_regex def project_path_regex
@project_path_regex ||= /\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\.]*(?<!\.git|\.atom)\z/.freeze @project_path_regex ||= /\A[a-zA-Z0-9_.][a-zA-Z0-9_\-\.]*(?<!\.git|\.atom)\z/.freeze
end end
...@@ -42,7 +39,6 @@ module Gitlab ...@@ -42,7 +39,6 @@ module Gitlab
"Cannot start with '-', end in '.git' or end in '.atom'" \ "Cannot start with '-', end in '.git' or end in '.atom'" \
end end
def file_name_regex def file_name_regex
@file_name_regex ||= /\A[a-zA-Z0-9_\-\.\@]*\z/.freeze @file_name_regex ||= /\A[a-zA-Z0-9_\-\.\@]*\z/.freeze
end end
...@@ -59,7 +55,6 @@ module Gitlab ...@@ -59,7 +55,6 @@ module Gitlab
"can contain only letters, digits, '_', '-', '@' and '.'. Separate directories with a '/'. " "can contain only letters, digits, '_', '-', '@' and '.'. Separate directories with a '/'. "
end end
def directory_traversal_regex def directory_traversal_regex
@directory_traversal_regex ||= /\.{2}/.freeze @directory_traversal_regex ||= /\.{2}/.freeze
end end
...@@ -68,7 +63,6 @@ module Gitlab ...@@ -68,7 +63,6 @@ module Gitlab
"cannot include directory traversal. " "cannot include directory traversal. "
end end
def archive_formats_regex def archive_formats_regex
# |zip|tar| tar.gz | tar.bz2 | # |zip|tar| tar.gz | tar.bz2 |
@archive_formats_regex ||= /(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/.freeze @archive_formats_regex ||= /(zip|tar|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/.freeze
......
module Gitlab module Gitlab
module Saml module Saml
class AuthHash < Gitlab::OAuth::AuthHash class AuthHash < Gitlab::OAuth::AuthHash
def groups def groups
get_raw(Gitlab::Saml::Config.groups) get_raw(Gitlab::Saml::Config.groups)
end end
...@@ -13,7 +12,6 @@ module Gitlab ...@@ -13,7 +12,6 @@ module Gitlab
# otherwise just the first value is returned # otherwise just the first value is returned
auth_hash.extra[:raw_info].all[key] auth_hash.extra[:raw_info].all[key]
end end
end end
end end
end end
module Gitlab module Gitlab
module Saml module Saml
class Config class Config
class << self class << self
def options def options
Gitlab.config.omniauth.providers.find { |provider| provider.name == 'saml' } Gitlab.config.omniauth.providers.find { |provider| provider.name == 'saml' }
...@@ -15,7 +14,6 @@ module Gitlab ...@@ -15,7 +14,6 @@ module Gitlab
options[:external_groups] options[:external_groups]
end end
end end
end end
end end
end end
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
module Gitlab module Gitlab
module Saml module Saml
class User < Gitlab::OAuth::User class User < Gitlab::OAuth::User
def save def save
super('SAML') super('SAML')
end end
......
...@@ -3,7 +3,6 @@ require "fileutils" ...@@ -3,7 +3,6 @@ require "fileutils"
# Taken from: Rack::Test::UploadedFile # Taken from: Rack::Test::UploadedFile
class UploadedFile class UploadedFile
# The filename, *not* including the path, of the "uploaded" file # The filename, *not* including the path, of the "uploaded" file
attr_reader :original_filename attr_reader :original_filename
......
...@@ -49,7 +49,6 @@ describe ApplicationController do ...@@ -49,7 +49,6 @@ describe ApplicationController do
end end
end end
context "when the 'PRIVATE-TOKEN' header is populated with the private token" do context "when the 'PRIVATE-TOKEN' header is populated with the private token" do
it "logs the user in" do it "logs the user in" do
@request.headers['PRIVATE-TOKEN'] = user.private_token @request.headers['PRIVATE-TOKEN'] = user.private_token
......
require 'spec_helper' require 'spec_helper'
describe Profiles::AccountsController do describe Profiles::AccountsController do
let(:user) { create(:omniauth_user, provider: 'saml') } let(:user) { create(:omniauth_user, provider: 'saml') }
before do before do
......
...@@ -68,7 +68,6 @@ describe Projects::BranchesController do ...@@ -68,7 +68,6 @@ describe Projects::BranchesController do
let(:branch) { "1-feature-branch" } let(:branch) { "1-feature-branch" }
let!(:issue) { create(:issue, project: project) } let!(:issue) { create(:issue, project: project) }
it 'redirects' do it 'redirects' do
post :create, post :create,
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
...@@ -89,7 +88,6 @@ describe Projects::BranchesController do ...@@ -89,7 +88,6 @@ describe Projects::BranchesController do
branch_name: branch, branch_name: branch,
issue_iid: issue.iid issue_iid: issue.iid
end end
end end
end end
......
...@@ -64,9 +64,7 @@ describe Projects::ForksController do ...@@ -64,9 +64,7 @@ describe Projects::ForksController do
expect(assigns[:forks]).to be_present expect(assigns[:forks]).to be_present
end end
end end
end end
end end
end end
end end
...@@ -18,7 +18,6 @@ describe Projects::LabelsController do ...@@ -18,7 +18,6 @@ describe Projects::LabelsController do
15.times { |i| create_label(priority: (i % 3) + 1, title: "label #{15 - i}") } 15.times { |i| create_label(priority: (i % 3) + 1, title: "label #{15 - i}") }
5.times { |i| create_label(title: "label #{100 - i}") } 5.times { |i| create_label(title: "label #{100 - i}") }
get :index, namespace_id: project.namespace.to_param, project_id: project.to_param get :index, namespace_id: project.namespace.to_param, project_id: project.to_param
end end
......
...@@ -117,7 +117,6 @@ describe Projects::MergeRequestsController do ...@@ -117,7 +117,6 @@ describe Projects::MergeRequestsController do
end end
context 'when filtering by opened state' do context 'when filtering by opened state' do
context 'with opened merge requests' do context 'with opened merge requests' do
it 'should list those merge requests' do it 'should list those merge requests' do
get_merge_requests get_merge_requests
...@@ -138,7 +137,6 @@ describe Projects::MergeRequestsController do ...@@ -138,7 +137,6 @@ describe Projects::MergeRequestsController do
expect(assigns(:merge_requests)).to include(merge_request) expect(assigns(:merge_requests)).to include(merge_request)
end end
end end
end end
end end
......
...@@ -28,7 +28,6 @@ describe Projects::RepositoriesController do ...@@ -28,7 +28,6 @@ describe Projects::RepositoriesController do
end end
context "when the service raises an error" do context "when the service raises an error" do
before do before do
allow(Gitlab::Workhorse).to receive(:send_git_archive).and_raise("Archive failed") allow(Gitlab::Workhorse).to receive(:send_git_archive).and_raise("Archive failed")
end end
......
...@@ -66,7 +66,6 @@ describe Projects::TreeController do ...@@ -66,7 +66,6 @@ describe Projects::TreeController do
let(:id) { '6d39438/.gitignore' } let(:id) { '6d39438/.gitignore' }
it { expect(response).to have_http_status(302) } it { expect(response).to have_http_status(302) }
end end
end end
describe 'GET show with blob path' do describe 'GET show with blob path' do
......
...@@ -89,15 +89,12 @@ describe ProjectsController do ...@@ -89,15 +89,12 @@ describe ProjectsController do
expect(response).to redirect_to("/#{public_project.path_with_namespace}") expect(response).to redirect_to("/#{public_project.path_with_namespace}")
end end
# MySQL queries are case insensitive by default, so this spec would fail. # MySQL queries are case insensitive by default, so this spec would fail.
if Gitlab::Database.postgresql? if Gitlab::Database.postgresql?
context "when there is also a match with the same casing" do context "when there is also a match with the same casing" do
let!(:other_project) { create(:project, :public, namespace: public_project.namespace, path: public_project.path.upcase) } let!(:other_project) { create(:project, :public, namespace: public_project.namespace, path: public_project.path.upcase) }
it "loads the exactly matched project" do it "loads the exactly matched project" do
get :show, namespace_id: public_project.namespace.path, id: public_project.path.upcase get :show, namespace_id: public_project.namespace.path, id: public_project.path.upcase
expect(assigns(:project)).to eq(other_project) expect(assigns(:project)).to eq(other_project)
......
...@@ -64,7 +64,6 @@ describe UsersController do ...@@ -64,7 +64,6 @@ describe UsersController do
end end
describe 'GET #calendar' do describe 'GET #calendar' do
it 'renders calendar' do it 'renders calendar' do
sign_in(user) sign_in(user)
......
...@@ -6,7 +6,6 @@ describe "Admin::Hooks", feature: true do ...@@ -6,7 +6,6 @@ describe "Admin::Hooks", feature: true do
login_as :admin login_as :admin
@system_hook = create(:system_hook) @system_hook = create(:system_hook)
end end
describe "GET /admin/hooks" do describe "GET /admin/hooks" do
...@@ -49,5 +48,4 @@ describe "Admin::Hooks", feature: true do ...@@ -49,5 +48,4 @@ describe "Admin::Hooks", feature: true do
it { expect(current_path).to eq(admin_hooks_path) } it { expect(current_path).to eq(admin_hooks_path) }
end end
end end
require 'spec_helper' require 'spec_helper'
describe "Dashboard > User filters projects", feature: true do describe "Dashboard > User filters projects", feature: true do
describe 'filtering personal projects' do describe 'filtering personal projects' do
before do before do
user = create(:user) user = create(:user)
......
...@@ -81,7 +81,6 @@ describe "GitLab Flavored Markdown", feature: true do ...@@ -81,7 +81,6 @@ describe "GitLab Flavored Markdown", feature: true do
end end
end end
describe "for merge requests" do describe "for merge requests" do
before do before do
@merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix #{issue.to_reference}") @merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix #{issue.to_reference}")
...@@ -100,7 +99,6 @@ describe "GitLab Flavored Markdown", feature: true do ...@@ -100,7 +99,6 @@ describe "GitLab Flavored Markdown", feature: true do
end end
end end
describe "for milestones" do describe "for milestones" do
before do before do
@milestone = create(:milestone, @milestone = create(:milestone,
......
...@@ -39,7 +39,6 @@ feature 'Groups > Members > Owner manages access requests', feature: true do ...@@ -39,7 +39,6 @@ feature 'Groups > Members > Owner manages access requests', feature: true do
expect(ActionMailer::Base.deliveries.last.subject).to match "Access to the #{group.name} group was denied" expect(ActionMailer::Base.deliveries.last.subject).to match "Access to the #{group.name} group was denied"
end end
def expect_visible_access_request(group, user) def expect_visible_access_request(group, user)
expect(group.members.request.exists?(user_id: user)).to be_truthy expect(group.members.request.exists?(user_id: user)).to be_truthy
expect(page).to have_content "#{group.name} access requests 1" expect(page).to have_content "#{group.name} access requests 1"
......
...@@ -14,7 +14,6 @@ describe 'Filter issues', feature: true do ...@@ -14,7 +14,6 @@ describe 'Filter issues', feature: true do
end end
describe 'Filter issues for assignee from issues#index' do describe 'Filter issues for assignee from issues#index' do
before do before do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
...@@ -36,7 +35,6 @@ describe 'Filter issues', feature: true do ...@@ -36,7 +35,6 @@ describe 'Filter issues', feature: true do
expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name) expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
end end
it 'should not change when all link is clicked' do it 'should not change when all link is clicked' do
find('.issues-state-filters a', text: "All").click find('.issues-state-filters a', text: "All").click
...@@ -46,7 +44,6 @@ describe 'Filter issues', feature: true do ...@@ -46,7 +44,6 @@ describe 'Filter issues', feature: true do
end end
describe 'Filter issues for milestone from issues#index' do describe 'Filter issues for milestone from issues#index' do
before do before do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
...@@ -68,7 +65,6 @@ describe 'Filter issues', feature: true do ...@@ -68,7 +65,6 @@ describe 'Filter issues', feature: true do
expect(find('.js-milestone-select .dropdown-toggle-text')).to have_content(milestone.title) expect(find('.js-milestone-select .dropdown-toggle-text')).to have_content(milestone.title)
end end
it 'should not change when all link is clicked' do it 'should not change when all link is clicked' do
find('.issues-state-filters a', text: "All").click find('.issues-state-filters a', text: "All").click
...@@ -113,7 +109,6 @@ describe 'Filter issues', feature: true do ...@@ -113,7 +109,6 @@ describe 'Filter issues', feature: true do
end end
describe 'Filter issues for assignee and label from issues#index' do describe 'Filter issues for assignee and label from issues#index' do
before do before do
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
...@@ -144,7 +139,6 @@ describe 'Filter issues', feature: true do ...@@ -144,7 +139,6 @@ describe 'Filter issues', feature: true do
expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title) expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
end end
it 'should not change when all link is clicked' do it 'should not change when all link is clicked' do
find('.issues-state-filters a', text: "All").click find('.issues-state-filters a', text: "All").click
......
...@@ -361,7 +361,6 @@ describe 'Issues', feature: true do ...@@ -361,7 +361,6 @@ describe 'Issues', feature: true do
let(:issue) { create(:issue, project: project, author: @user, assignee: @user) } let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
context 'by authorized user' do context 'by authorized user' do
it 'allows user to select unassigned', js: true do it 'allows user to select unassigned', js: true do
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
...@@ -420,7 +419,6 @@ describe 'Issues', feature: true do ...@@ -420,7 +419,6 @@ describe 'Issues', feature: true do
end end
context 'by unauthorized user' do context 'by unauthorized user' do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
...@@ -442,8 +440,6 @@ describe 'Issues', feature: true do ...@@ -442,8 +440,6 @@ describe 'Issues', feature: true do
let!(:milestone) { create(:milestone, project: project) } let!(:milestone) { create(:milestone, project: project) }
context 'by authorized user' do context 'by authorized user' do
it 'allows user to select unassigned', js: true do it 'allows user to select unassigned', js: true do
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
......
...@@ -20,7 +20,6 @@ feature 'project commit builds' do ...@@ -20,7 +20,6 @@ feature 'project commit builds' do
visit builds_namespace_project_commit_path(project.namespace, visit builds_namespace_project_commit_path(project.namespace,
project, project.commit.sha) project, project.commit.sha)
expect(page).to have_content('Builds') expect(page).to have_content('Builds')
end end
end end
......
...@@ -5,7 +5,6 @@ describe 'Cherry-pick Commits' do ...@@ -5,7 +5,6 @@ describe 'Cherry-pick Commits' do
let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') } let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') } let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') }
before do before do
login_as :user login_as :user
project.team << [@user, :master] project.team << [@user, :master]
......
require 'spec_helper' require 'spec_helper'
feature 'Issue prioritization', feature: true do feature 'Issue prioritization', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project, name: 'test', namespace: user.namespace) } let(:project) { create(:project, name: 'test', namespace: user.namespace) }
...@@ -15,7 +14,6 @@ feature 'Issue prioritization', feature: true do ...@@ -15,7 +14,6 @@ feature 'Issue prioritization', feature: true do
# According to https://gitlab.com/gitlab-org/gitlab-ce/issues/14189#note_4360653 # According to https://gitlab.com/gitlab-org/gitlab-ce/issues/14189#note_4360653
context 'when issues have one label' do context 'when issues have one label' do
scenario 'Are sorted properly' do scenario 'Are sorted properly' do
# Issues # Issues
issue_1 = create(:issue, title: 'issue_1', project: project) issue_1 = create(:issue, title: 'issue_1', project: project)
issue_2 = create(:issue, title: 'issue_2', project: project) issue_2 = create(:issue, title: 'issue_2', project: project)
...@@ -46,7 +44,6 @@ feature 'Issue prioritization', feature: true do ...@@ -46,7 +44,6 @@ feature 'Issue prioritization', feature: true do
context 'when issues have multiple labels' do context 'when issues have multiple labels' do
scenario 'Are sorted properly' do scenario 'Are sorted properly' do
# Issues # Issues
issue_1 = create(:issue, title: 'issue_1', project: project) issue_1 = create(:issue, title: 'issue_1', project: project)
issue_2 = create(:issue, title: 'issue_2', project: project) issue_2 = create(:issue, title: 'issue_2', project: project)
......
...@@ -48,9 +48,7 @@ describe "Search", feature: true do ...@@ -48,9 +48,7 @@ describe "Search", feature: true do
end end
end end
describe 'Right header search field', feature: true do describe 'Right header search field', feature: true do
describe 'Search in project page' do describe 'Search in project page' do
before do before do
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
...@@ -73,7 +71,6 @@ describe "Search", feature: true do ...@@ -73,7 +71,6 @@ describe "Search", feature: true do
end end
context 'click the links in the category search dropdown', js: true do context 'click the links in the category search dropdown', js: true do
before do before do
page.find('#search').click page.find('#search').click
end end
...@@ -124,6 +121,4 @@ describe "Search", feature: true do ...@@ -124,6 +121,4 @@ describe "Search", feature: true do
end end
end end
end end
end end
...@@ -76,7 +76,6 @@ describe 'Internal Group access', feature: true do ...@@ -76,7 +76,6 @@ describe 'Internal Group access', feature: true do
it { is_expected.to be_denied_for :visitor } it { is_expected.to be_denied_for :visitor }
end end
describe 'GET /groups/:path/group_members' do describe 'GET /groups/:path/group_members' do
subject { group_group_members_path(group) } subject { group_group_members_path(group) }
......
...@@ -76,7 +76,6 @@ describe 'Private Group access', feature: true do ...@@ -76,7 +76,6 @@ describe 'Private Group access', feature: true do
it { is_expected.to be_denied_for :visitor } it { is_expected.to be_denied_for :visitor }
end end
describe 'GET /groups/:path/group_members' do describe 'GET /groups/:path/group_members' do
subject { group_group_members_path(group) } subject { group_group_members_path(group) }
......
...@@ -76,7 +76,6 @@ describe 'Public Group access', feature: true do ...@@ -76,7 +76,6 @@ describe 'Public Group access', feature: true do
it { is_expected.to be_allowed_for :visitor } it { is_expected.to be_allowed_for :visitor }
end end
describe 'GET /groups/:path/group_members' do describe 'GET /groups/:path/group_members' do
subject { group_group_members_path(group) } subject { group_group_members_path(group) }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment