Merge branch 'master' into diff-line-comment-vuejs
This commit is contained in:
commit
a77629b1cb
|
@ -97,6 +97,7 @@ v 8.11.0 (unreleased)
|
|||
- Add commit stats in commit api. !5517 (dixpac)
|
||||
- Add CI configuration button on project page
|
||||
- Make error pages responsive (Takuya Noguchi)
|
||||
- The performance of the project dropdown used for moving issues has been improved
|
||||
- Fix skip_repo parameter being ignored when destroying a namespace
|
||||
- Change requests_profiles resource constraint to catch virtually any file
|
||||
- Bump gitlab_git to lazy load compare commits
|
||||
|
@ -146,6 +147,9 @@ v 8.10.3
|
|||
- Fix importer for GitHub Pull Requests when a branch was removed. !5573
|
||||
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. !5584
|
||||
- Trim extra displayed carriage returns in diffs and files with CRLFs. !5588
|
||||
- Fix label already exist error message in the right sidebar.
|
||||
|
||||
v 8.10.3 (unreleased)
|
||||
|
||||
v 8.10.2
|
||||
- User can now search branches by name. !5144
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
this.render = bind(this.render, this);
|
||||
this.VIEW_TYPE = $('input#view[type=hidden]').val();
|
||||
debounce = _.debounce(this.render, DEBOUNCE_TIMEOUT_DURATION);
|
||||
$(document).off('mouseover', LINE_COLUMN_CLASSES).off('mouseleave', LINE_COLUMN_CLASSES).on('mouseover', LINE_COLUMN_CLASSES, debounce).on('mouseleave', LINE_COLUMN_CLASSES, this.destroy);
|
||||
$(this.filesContainerElement).off('mouseover', LINE_COLUMN_CLASSES).off('mouseleave', LINE_COLUMN_CLASSES).on('mouseover', LINE_COLUMN_CLASSES, debounce).on('mouseleave', LINE_COLUMN_CLASSES, this.destroy);
|
||||
}
|
||||
|
||||
FilesCommentButton.prototype.render = function(e) {
|
||||
|
|
|
@ -70,13 +70,15 @@
|
|||
name: newLabelField.val(),
|
||||
color: newColorField.val()
|
||||
}, function(label) {
|
||||
var errors;
|
||||
$newLabelCreateButton.enable();
|
||||
if (label.message != null) {
|
||||
errors = _.map(label.message, function(value, key) {
|
||||
return key + " " + value[0];
|
||||
});
|
||||
return $newLabelError.html(errors.join("<br/>")).show();
|
||||
var errorText = label.message;
|
||||
if (_.isObject(label.message)) {
|
||||
errorText = _.map(label.message, function(value, key) {
|
||||
return key + " " + value[0];
|
||||
}).join('<br/>');
|
||||
}
|
||||
return $newLabelError.html(errorText).show();
|
||||
} else {
|
||||
return $('.dropdown-menu-back', $dropdown.parent()).trigger('click');
|
||||
}
|
||||
|
|
|
@ -35,19 +35,13 @@ class AutocompleteController < ApplicationController
|
|||
|
||||
def projects
|
||||
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
|
||||
projects = projects_finder.execute(project, search: params[:search], offset_id: params[:offset_id])
|
||||
|
||||
no_project = {
|
||||
id: 0,
|
||||
name_with_namespace: 'No project',
|
||||
}
|
||||
projects.unshift(no_project)
|
||||
projects.delete(project)
|
||||
projects.unshift(no_project) unless params[:offset_id].present?
|
||||
|
||||
render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
|
||||
end
|
||||
|
@ -79,4 +73,8 @@ class AutocompleteController < ApplicationController
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
def projects_finder
|
||||
MoveToProjectFinder.new(current_user)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
class MoveToProjectFinder
|
||||
def initialize(user)
|
||||
@user = user
|
||||
end
|
||||
|
||||
def execute(from_project, search: nil, offset_id: nil)
|
||||
projects = @user.projects_where_can_admin_issues
|
||||
projects = projects.search(search) if search.present?
|
||||
projects = projects.excluding_project(from_project)
|
||||
|
||||
# to ask for Project#name_with_namespace
|
||||
projects.includes(namespace: :owner)
|
||||
end
|
||||
end
|
|
@ -197,6 +197,8 @@ class Project < ActiveRecord::Base
|
|||
scope :active, -> { joins(:issues, :notes, :merge_requests).order('issues.created_at, notes.created_at, merge_requests.created_at DESC') }
|
||||
scope :abandoned, -> { where('projects.last_activity_at < ?', 6.months.ago) }
|
||||
|
||||
scope :excluding_project, ->(project) { where.not(id: project) }
|
||||
|
||||
state_machine :import_status, initial: :none do
|
||||
event :import_start do
|
||||
transition [:none, :finished] => :started
|
||||
|
|
|
@ -429,6 +429,13 @@ class User < ActiveRecord::Base
|
|||
owned_groups.select(:id), namespace.id).joins(:namespace)
|
||||
end
|
||||
|
||||
# Returns projects which user can admin issues on (for example to move an issue to that project).
|
||||
#
|
||||
# This logic is duplicated from `Ability#project_abilities` into a SQL form.
|
||||
def projects_where_can_admin_issues
|
||||
authorized_projects(Gitlab::Access::REPORTER).non_archived.where.not(issues_enabled: false)
|
||||
end
|
||||
|
||||
def is_admin?
|
||||
admin
|
||||
end
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
module Gitlab
|
||||
class DowntimeCheck
|
||||
class Message
|
||||
attr_reader :path, :offline, :reason
|
||||
attr_reader :path, :offline
|
||||
|
||||
OFFLINE = "\e[32moffline\e[0m"
|
||||
ONLINE = "\e[31monline\e[0m"
|
||||
OFFLINE = "\e[31moffline\e[0m"
|
||||
ONLINE = "\e[32monline\e[0m"
|
||||
|
||||
# path - The file path of the migration.
|
||||
# offline - When set to `true` the migration will require downtime.
|
||||
|
@ -19,10 +19,21 @@ module Gitlab
|
|||
label = offline ? OFFLINE : ONLINE
|
||||
|
||||
message = "[#{label}]: #{path}"
|
||||
message += ": #{reason}" if reason
|
||||
|
||||
if reason?
|
||||
message += ":\n\n#{reason}\n\n"
|
||||
end
|
||||
|
||||
message
|
||||
end
|
||||
|
||||
def reason?
|
||||
@reason.present?
|
||||
end
|
||||
|
||||
def reason
|
||||
@reason.strip.lines.map(&:strip).join("\n")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,178 +2,262 @@ require 'spec_helper'
|
|||
|
||||
describe AutocompleteController do
|
||||
let!(:project) { create(:project) }
|
||||
let!(:user) { create(:user) }
|
||||
let!(:user2) { create(:user) }
|
||||
let!(:non_member) { create(:user) }
|
||||
let!(:user) { create(:user) }
|
||||
|
||||
context 'project members' do
|
||||
before do
|
||||
sign_in(user)
|
||||
project.team << [user, :master]
|
||||
context 'users and members' do
|
||||
let!(:user2) { create(:user) }
|
||||
let!(:non_member) { create(:user) }
|
||||
|
||||
context 'project members' do
|
||||
before do
|
||||
sign_in(user)
|
||||
project.team << [user, :master]
|
||||
end
|
||||
|
||||
describe 'GET #users with project ID' do
|
||||
before do
|
||||
get(:users, project_id: project.id)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
it { expect(body.map { |u| u["username"] }).to include(user.username) }
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown project' do
|
||||
before do
|
||||
get(:users, project_id: 'unknown')
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #users with project ID' do
|
||||
context 'group members' do
|
||||
let(:group) { create(:group) }
|
||||
|
||||
before do
|
||||
get(:users, project_id: project.id)
|
||||
sign_in(user)
|
||||
group.add_owner(user)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with group ID' do
|
||||
before do
|
||||
get(:users, group_id: group.id)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
it { expect(body.first["username"]).to eq user.username }
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown group ID' do
|
||||
before do
|
||||
get(:users, group_id: 'unknown')
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
end
|
||||
|
||||
context 'non-member login for public project' do
|
||||
let!(:project) { create(:project, :public) }
|
||||
|
||||
before do
|
||||
sign_in(non_member)
|
||||
project.team << [user, :master]
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with project ID' do
|
||||
before do
|
||||
get(:users, project_id: project.id, current_user: true)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 2 }
|
||||
it { expect(body.map { |u| u['username'] }).to match_array([user.username, non_member.username]) }
|
||||
end
|
||||
end
|
||||
|
||||
context 'all users' do
|
||||
before do
|
||||
sign_in(user)
|
||||
get(:users)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
it { expect(body.map { |u| u["username"] }).to include(user.username) }
|
||||
it { expect(body.size).to eq User.count }
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown project' do
|
||||
before do
|
||||
get(:users, project_id: 'unknown')
|
||||
context 'unauthenticated user' do
|
||||
let(:public_project) { create(:project, :public) }
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with public project' do
|
||||
before do
|
||||
public_project.team << [user, :guest]
|
||||
get(:users, project_id: public_project.id)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
describe 'GET #users with project' do
|
||||
before do
|
||||
get(:users, project_id: project.id)
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown project' do
|
||||
before do
|
||||
get(:users, project_id: 'unknown')
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
|
||||
describe 'GET #users with inaccessible group' do
|
||||
before do
|
||||
project.team << [user, :guest]
|
||||
get(:users, group_id: user.namespace.id)
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
|
||||
describe 'GET #users with no project' do
|
||||
before do
|
||||
get(:users)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 0 }
|
||||
end
|
||||
end
|
||||
|
||||
context 'author of issuable included' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it 'includes the author' do
|
||||
get(:users, author_id: non_member.id)
|
||||
|
||||
expect(body.first["username"]).to eq non_member.username
|
||||
end
|
||||
|
||||
it 'rejects non existent user ids' do
|
||||
get(:users, author_id: 99999)
|
||||
|
||||
expect(body.collect { |u| u['id'] }).not_to include(99999)
|
||||
end
|
||||
end
|
||||
|
||||
context 'skip_users parameter included' do
|
||||
before { sign_in(user) }
|
||||
|
||||
it 'skips the user IDs passed' do
|
||||
get(:users, skip_users: [user, user2].map(&:id))
|
||||
|
||||
other_user_ids = [non_member, project.owner, project.creator].map(&:id)
|
||||
response_user_ids = JSON.parse(response.body).map { |user| user['id'] }
|
||||
|
||||
expect(response_user_ids).to contain_exactly(*other_user_ids)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'group members' do
|
||||
let(:group) { create(:group) }
|
||||
context 'projects' do
|
||||
let(:authorized_project) { create(:project) }
|
||||
let(:authorized_search_project) { create(:project, name: 'rugged') }
|
||||
|
||||
before do
|
||||
sign_in(user)
|
||||
group.add_owner(user)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with group ID' do
|
||||
before do
|
||||
get(:users, group_id: group.id)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
it { expect(body.first["username"]).to eq user.username }
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown group ID' do
|
||||
before do
|
||||
get(:users, group_id: 'unknown')
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
end
|
||||
|
||||
context 'non-member login for public project' do
|
||||
let!(:project) { create(:project, :public) }
|
||||
|
||||
before do
|
||||
sign_in(non_member)
|
||||
project.team << [user, :master]
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with project ID' do
|
||||
context 'authorized projects' do
|
||||
before do
|
||||
get(:users, project_id: project.id, current_user: true)
|
||||
authorized_project.team << [user, :master]
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 2 }
|
||||
it { expect(body.map { |u| u['username'] }).to match_array([user.username, non_member.username]) }
|
||||
end
|
||||
end
|
||||
describe 'GET #projects with project ID' do
|
||||
before do
|
||||
get(:projects, project_id: project.id)
|
||||
end
|
||||
|
||||
context 'all users' do
|
||||
before do
|
||||
sign_in(user)
|
||||
get(:users)
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it do
|
||||
expect(body).to be_kind_of(Array)
|
||||
expect(body.size).to eq 2
|
||||
|
||||
expect(body.first['id']).to eq 0
|
||||
expect(body.first['name_with_namespace']).to eq 'No project'
|
||||
|
||||
expect(body.last['id']).to eq authorized_project.id
|
||||
expect(body.last['name_with_namespace']).to eq authorized_project.name_with_namespace
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq User.count }
|
||||
end
|
||||
|
||||
context 'unauthenticated user' do
|
||||
let(:public_project) { create(:project, :public) }
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
describe 'GET #users with public project' do
|
||||
context 'authorized projects and search' do
|
||||
before do
|
||||
public_project.team << [user, :guest]
|
||||
get(:users, project_id: public_project.id)
|
||||
authorized_project.team << [user, :master]
|
||||
authorized_search_project.team << [user, :master]
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 1 }
|
||||
describe 'GET #projects with project ID and search' do
|
||||
before do
|
||||
get(:projects, project_id: project.id, search: 'rugged')
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it do
|
||||
expect(body).to be_kind_of(Array)
|
||||
expect(body.size).to eq 2
|
||||
|
||||
expect(body.last['id']).to eq authorized_search_project.id
|
||||
expect(body.last['name_with_namespace']).to eq authorized_search_project.name_with_namespace
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #users with project' do
|
||||
before do
|
||||
get(:users, project_id: project.id)
|
||||
context 'authorized projects without admin_issue ability' do
|
||||
before(:each) do
|
||||
authorized_project.team << [user, :guest]
|
||||
|
||||
expect(user.can?(:admin_issue, authorized_project)).to eq(false)
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
describe 'GET #projects with project ID' do
|
||||
before do
|
||||
get(:projects, project_id: project.id)
|
||||
end
|
||||
|
||||
describe 'GET #users with unknown project' do
|
||||
before do
|
||||
get(:users, project_id: 'unknown')
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it do
|
||||
expect(body).to be_kind_of(Array)
|
||||
expect(body.size).to eq 1 # 'No project'
|
||||
|
||||
expect(body.first['id']).to eq 0
|
||||
end
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
|
||||
describe 'GET #users with inaccessible group' do
|
||||
before do
|
||||
project.team << [user, :guest]
|
||||
get(:users, group_id: user.namespace.id)
|
||||
end
|
||||
|
||||
it { expect(response).to have_http_status(404) }
|
||||
end
|
||||
|
||||
describe 'GET #users with no project' do
|
||||
before do
|
||||
get(:users)
|
||||
end
|
||||
|
||||
it { expect(body).to be_kind_of(Array) }
|
||||
it { expect(body.size).to eq 0 }
|
||||
end
|
||||
end
|
||||
|
||||
context 'author of issuable included' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
let(:body) { JSON.parse(response.body) }
|
||||
|
||||
it 'includes the author' do
|
||||
get(:users, author_id: non_member.id)
|
||||
|
||||
expect(body.first["username"]).to eq non_member.username
|
||||
end
|
||||
|
||||
it 'rejects non existent user ids' do
|
||||
get(:users, author_id: 99999)
|
||||
|
||||
expect(body.collect { |u| u['id'] }).not_to include(99999)
|
||||
end
|
||||
end
|
||||
|
||||
context 'skip_users parameter included' do
|
||||
before { sign_in(user) }
|
||||
|
||||
it 'skips the user IDs passed' do
|
||||
get(:users, skip_users: [user, user2].map(&:id))
|
||||
|
||||
other_user_ids = [non_member, project.owner, project.creator].map(&:id)
|
||||
response_user_ids = JSON.parse(response.body).map { |user| user['id'] }
|
||||
|
||||
expect(response_user_ids).to contain_exactly(*other_user_ids)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -0,0 +1,75 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MoveToProjectFinder do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
|
||||
let(:no_access_project) { create(:project) }
|
||||
let(:guest_project) { create(:project) }
|
||||
let(:reporter_project) { create(:project) }
|
||||
let(:developer_project) { create(:project) }
|
||||
let(:master_project) { create(:project) }
|
||||
|
||||
subject { described_class.new(user) }
|
||||
|
||||
describe '#execute' do
|
||||
context 'filter' do
|
||||
it 'does not return projects under Gitlab::Access::REPORTER' do
|
||||
guest_project.team << [user, :guest]
|
||||
|
||||
expect(subject.execute(project)).to be_empty
|
||||
end
|
||||
|
||||
it 'returns projects equal or above Gitlab::Access::REPORTER ordered by id in descending order' do
|
||||
reporter_project.team << [user, :reporter]
|
||||
developer_project.team << [user, :developer]
|
||||
master_project.team << [user, :master]
|
||||
|
||||
expect(subject.execute(project).to_a).to eq([master_project, developer_project, reporter_project])
|
||||
end
|
||||
|
||||
it 'does not include the source project' do
|
||||
project.team << [user, :reporter]
|
||||
|
||||
expect(subject.execute(project).to_a).to be_empty
|
||||
end
|
||||
|
||||
it 'does not return archived projects' do
|
||||
reporter_project.team << [user, :reporter]
|
||||
reporter_project.update_attributes(archived: true)
|
||||
other_reporter_project = create(:project)
|
||||
other_reporter_project.team << [user, :reporter]
|
||||
|
||||
expect(subject.execute(project).to_a).to eq([other_reporter_project])
|
||||
end
|
||||
|
||||
it 'does not return projects for which issues are disabled' do
|
||||
reporter_project.team << [user, :reporter]
|
||||
reporter_project.update_attributes(issues_enabled: false)
|
||||
other_reporter_project = create(:project)
|
||||
other_reporter_project.team << [user, :reporter]
|
||||
|
||||
expect(subject.execute(project).to_a).to eq([other_reporter_project])
|
||||
end
|
||||
end
|
||||
|
||||
context 'search' do
|
||||
it 'uses Project#search' do
|
||||
expect(user).to receive_message_chain(:projects_where_can_admin_issues, :search) { Project.all }
|
||||
|
||||
subject.execute(project, search: 'wadus')
|
||||
end
|
||||
|
||||
it 'returns projects matching a search query' do
|
||||
foo_project = create(:project)
|
||||
foo_project.team << [user, :master]
|
||||
|
||||
wadus_project = create(:project, name: 'wadus')
|
||||
wadus_project.team << [user, :master]
|
||||
|
||||
expect(subject.execute(project).to_a).to eq([wadus_project, foo_project])
|
||||
expect(subject.execute(project, search: 'wadus').to_a).to eq([wadus_project])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -5,13 +5,35 @@ describe Gitlab::DowntimeCheck::Message do
|
|||
it 'returns an ANSI formatted String for an offline migration' do
|
||||
message = described_class.new('foo.rb', true, 'hello')
|
||||
|
||||
expect(message.to_s).to eq("[\e[32moffline\e[0m]: foo.rb: hello")
|
||||
expect(message.to_s).to eq("[\e[31moffline\e[0m]: foo.rb:\n\nhello\n\n")
|
||||
end
|
||||
|
||||
it 'returns an ANSI formatted String for an online migration' do
|
||||
message = described_class.new('foo.rb')
|
||||
|
||||
expect(message.to_s).to eq("[\e[31monline\e[0m]: foo.rb")
|
||||
expect(message.to_s).to eq("[\e[32monline\e[0m]: foo.rb")
|
||||
end
|
||||
end
|
||||
|
||||
describe '#reason?' do
|
||||
it 'returns false when no reason is specified' do
|
||||
message = described_class.new('foo.rb')
|
||||
|
||||
expect(message.reason?).to eq(false)
|
||||
end
|
||||
|
||||
it 'returns true when a reason is specified' do
|
||||
message = described_class.new('foo.rb', true, 'hello')
|
||||
|
||||
expect(message.reason?).to eq(true)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#reason' do
|
||||
it 'strips excessive whitespace from the returned String' do
|
||||
message = described_class.new('foo.rb', true, " hello\n world\n\n foo")
|
||||
|
||||
expect(message.reason).to eq("hello\nworld\n\nfoo")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -957,6 +957,53 @@ describe User, models: true do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#projects_where_can_admin_issues' do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
it 'includes projects for which the user access level is above or equal to reporter' do
|
||||
create(:project)
|
||||
reporter_project = create(:project)
|
||||
developer_project = create(:project)
|
||||
master_project = create(:project)
|
||||
|
||||
reporter_project.team << [user, :reporter]
|
||||
developer_project.team << [user, :developer]
|
||||
master_project.team << [user, :master]
|
||||
|
||||
expect(user.projects_where_can_admin_issues.to_a).to eq([master_project, developer_project, reporter_project])
|
||||
expect(user.can?(:admin_issue, master_project)).to eq(true)
|
||||
expect(user.can?(:admin_issue, developer_project)).to eq(true)
|
||||
expect(user.can?(:admin_issue, reporter_project)).to eq(true)
|
||||
end
|
||||
|
||||
it 'does not include for which the user access level is below reporter' do
|
||||
project = create(:project)
|
||||
guest_project = create(:project)
|
||||
|
||||
guest_project.team << [user, :guest]
|
||||
|
||||
expect(user.projects_where_can_admin_issues.to_a).to be_empty
|
||||
expect(user.can?(:admin_issue, guest_project)).to eq(false)
|
||||
expect(user.can?(:admin_issue, project)).to eq(false)
|
||||
end
|
||||
|
||||
it 'does not include archived projects' do
|
||||
project = create(:project)
|
||||
project.update_attributes(archived: true)
|
||||
|
||||
expect(user.projects_where_can_admin_issues.to_a).to be_empty
|
||||
expect(user.can?(:admin_issue, project)).to eq(false)
|
||||
end
|
||||
|
||||
it 'does not include projects for which issues are disabled' do
|
||||
project = create(:project)
|
||||
project.update_attributes(issues_enabled: false)
|
||||
|
||||
expect(user.projects_where_can_admin_issues.to_a).to be_empty
|
||||
expect(user.can?(:admin_issue, project)).to eq(false)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#ci_authorized_runners' do
|
||||
let(:user) { create(:user) }
|
||||
let(:runner) { create(:ci_runner) }
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,2 @@
|
|||
<% type = Rails.env.development? ? 'full' : 'min' %>
|
||||
<%= File.read(Rails.root.join("vendor/assets/javascripts/vue-resource.#{type}.js")) %>
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,2 @@
|
|||
<% type = Rails.env.development? ? 'full' : 'min' %>
|
||||
<%= File.read(Rails.root.join("vendor/assets/javascripts/vue.#{type}.js")) %>
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue