Skip to content
Snippets Groups Projects
Commit cfd475a4 authored by Tiago Botelho's avatar Tiago Botelho
Browse files

Removes default scope from sortable

parent d1b60cbc
No related branches found
No related tags found
No related merge requests found
Showing
with 31 additions and 27 deletions
Loading
Loading
@@ -20,7 +20,7 @@ module API
use :pagination
end
get do
messages = BroadcastMessage.all
messages = BroadcastMessage.all.order_id_desc
 
present paginate(messages), with: Entities::BroadcastMessage
end
Loading
Loading
Loading
Loading
@@ -21,7 +21,7 @@ module API
get ":id/merge_requests/:merge_request_iid/versions" do
merge_request = find_merge_request_with_access(params[:merge_request_iid])
 
present paginate(merge_request.merge_request_diffs), with: Entities::MergeRequestDiff
present paginate(merge_request.merge_request_diffs.order_id_desc), with: Entities::MergeRequestDiff
end
 
desc 'Get a single merge request diff version' do
Loading
Loading
Loading
Loading
@@ -28,7 +28,7 @@ module API
end
 
def list_milestones_for(parent)
milestones = parent.milestones
milestones = parent.milestones.order_id_desc
milestones = Milestone.filter_by_state(milestones, params[:state])
milestones = filter_by_iid(milestones, params[:iids]) if params[:iids].present?
milestones = filter_by_search(milestones, params[:search]) if params[:search]
Loading
Loading
Loading
Loading
@@ -20,7 +20,7 @@ module API
get ":id/merge_requests/:merge_request_id/versions" do
merge_request = find_merge_request_with_access(params[:merge_request_id])
 
present merge_request.merge_request_diffs, with: ::API::Entities::MergeRequestDiff
present merge_request.merge_request_diffs.order_id_desc, with: ::API::Entities::MergeRequestDiff
end
 
desc 'Get a single merge request diff version' do
Loading
Loading
Loading
Loading
@@ -34,6 +34,7 @@ module API
milestones = user_project.milestones
milestones = filter_milestones_state(milestones, params[:state])
milestones = filter_by_iid(milestones, params[:iid]) if params[:iid].present?
milestones = milestones.order_id_desc
 
present paginate(milestones), with: ::API::Entities::Milestone
end
Loading
Loading
Loading
Loading
@@ -119,7 +119,7 @@ module API
get do
authenticate!
 
present_projects current_user.authorized_projects,
present_projects current_user.authorized_projects.order_id_desc,
with: ::API::V3::Entities::ProjectWithAccess
end
 
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ feature 'Import/Export - project import integration test', js: true do
 
context 'when selecting the namespace' do
let(:user) { create(:admin) }
let!(:namespace) { create(:namespace, name: 'asd', owner: user) }
let!(:namespace) { user.namespace }
let(:project_path) { 'test-project-path' + SecureRandom.hex }
 
context 'prefilled the path' do
Loading
Loading
@@ -66,12 +66,11 @@ feature 'Import/Export - project import integration test', js: true do
end
 
scenario 'invalid project' do
namespace = create(:namespace, name: 'asdf', owner: user)
project = create(:project, namespace: namespace)
project = create(:project, namespace: user.namespace)
 
visit new_project_path
 
select2(namespace.id, from: '#project_namespace_id')
select2(user.namespace.id, from: '#project_namespace_id')
fill_in :project_path, with: project.name, visible: true
click_link 'GitLab export'
attach_file('file', file)
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@ describe GroupMembersFinder, '#execute' do
 
result = described_class.new(group).execute
 
expect(result.to_a).to eq([member3, member2, member1])
expect(result.to_a).to match_array([member3, member2, member1])
end
 
it 'returns members for nested group', :nested_groups do
Loading
Loading
@@ -27,6 +27,6 @@ describe GroupMembersFinder, '#execute' do
 
result = described_class.new(nested_group).execute
 
expect(result.to_a).to eq([member4, member3, member1])
expect(result.to_a).to match_array([member1, member3, member4])
end
end
Loading
Loading
@@ -17,6 +17,6 @@ describe MembersFinder, '#execute' do
 
result = described_class.new(project, user2).execute
 
expect(result.to_a).to eq([member3, member2, member1])
expect(result.to_a).to match_array([member1, member2, member3])
end
end
Loading
Loading
@@ -404,6 +404,6 @@ describe Namespace do
let!(:project1) { create(:project_empty_repo, namespace: group) }
let!(:project2) { create(:project_empty_repo, namespace: child) }
 
it { expect(group.all_projects.to_a).to eq([project2, project1]) }
it { expect(group.all_projects.to_a).to match_array([project2, project1]) }
end
end
Loading
Loading
@@ -1517,7 +1517,7 @@ describe User do
developer_project = create(:project) { |p| p.add_developer(user) }
master_project = create(:project) { |p| p.add_master(user) }
 
expect(user.projects_where_can_admin_issues.to_a).to eq([master_project, developer_project, reporter_project])
expect(user.projects_where_can_admin_issues.to_a).to match_array([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)
Loading
Loading
Loading
Loading
@@ -14,7 +14,7 @@ describe API::MergeRequestDiffs, 'MergeRequestDiffs' do
describe 'GET /projects/:id/merge_requests/:merge_request_iid/versions' do
it 'returns 200 for a valid merge request' do
get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/versions", user)
merge_request_diff = merge_request.merge_request_diffs.first
merge_request_diff = merge_request.merge_request_diffs.last
 
expect(response.status).to eq 200
expect(response).to include_pagination_headers
Loading
Loading
Loading
Loading
@@ -574,7 +574,7 @@ describe API::Projects do
expect { post api("/projects/user/#{user.id}", admin), name: 'Foo Project' }.to change {Project.count}.by(1)
expect(response).to have_http_status(201)
 
project = Project.first
project = Project.last
 
expect(project.name).to eq('Foo Project')
expect(project.path).to eq('foo-project')
Loading
Loading
@@ -585,7 +585,7 @@ describe API::Projects do
.to change { Project.count }.by(1)
expect(response).to have_http_status(201)
 
project = Project.first
project = Project.last
 
expect(project.name).to eq('Foo Project')
expect(project.path).to eq('path-project-Foo')
Loading
Loading
Loading
Loading
@@ -14,7 +14,7 @@ describe API::V3::MergeRequestDiffs, 'MergeRequestDiffs' do
describe 'GET /projects/:id/merge_requests/:merge_request_id/versions' do
it 'returns 200 for a valid merge request' do
get v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions", user)
merge_request_diff = merge_request.merge_request_diffs.first
merge_request_diff = merge_request.merge_request_diffs.last
 
expect(response.status).to eq 200
expect(json_response.size).to eq(merge_request.merge_request_diffs.size)
Loading
Loading
Loading
Loading
@@ -93,7 +93,7 @@ describe 'cycle analytics events' do
 
context 'with private project and builds' do
before do
project.members.first.update(access_level: Gitlab::Access::GUEST)
project.members.last.update(access_level: Gitlab::Access::GUEST)
end
 
it 'does not list the test events' do
Loading
Loading
Loading
Loading
@@ -1237,7 +1237,7 @@ describe NotificationService, :mailer do
end
 
it do
group_member = group.members.first
group_member = group.members.last
 
expect do
notification.decline_group_invite(group_member)
Loading
Loading
@@ -1285,7 +1285,7 @@ describe NotificationService, :mailer do
end
 
it do
project_member = project.members.first
project_member = project.members.last
 
expect do
notification.decline_project_invite(project_member)
Loading
Loading
Loading
Loading
@@ -140,9 +140,14 @@ shared_examples 'a GitHub-ish import controller: POST create' do
end
 
context "when a namespace with the provider user's username already exists" do
let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
let!(:existing_namespace) { user.namespace }
 
context "when the namespace is owned by the GitLab user" do
before do
user.username = other_username
user.save
end
it "takes the existing namespace" do
expect(Gitlab::GithubImport::ProjectCreator)
.to receive(:new).with(provider_repo, provider_repo.name, existing_namespace, user, access_params, type: provider)
Loading
Loading
@@ -153,12 +158,9 @@ shared_examples 'a GitHub-ish import controller: POST create' do
end
 
context "when the namespace is not owned by the GitLab user" do
before do
existing_namespace.owner = create(:user)
existing_namespace.save
end
it "creates a project using user's namespace" do
create(:user, username: other_username)
expect(Gitlab::GithubImport::ProjectCreator)
.to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider)
.and_return(double(execute: true))
Loading
Loading
Loading
Loading
@@ -127,6 +127,7 @@ describe PostReceive do
 
it "asks the project to trigger all hooks" do
allow(Project).to receive(:find_by).and_return(project)
expect(project).to receive(:execute_hooks).twice
expect(project).to receive(:execute_services).twice
 
Loading
Loading
@@ -135,6 +136,7 @@ describe PostReceive do
 
it "enqueues a UpdateMergeRequestsWorker job" do
allow(Project).to receive(:find_by).and_return(project)
expect(UpdateMergeRequestsWorker).to receive(:perform_async).with(project.id, project.owner.id, any_args)
 
described_class.new.perform(gl_repository, key_id, base64_changes)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment