Commit ef5b36ea authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed protected branches and file edit

parent afbdbb0c
...@@ -19,9 +19,9 @@ class Admin::UsersController < AdminController ...@@ -19,9 +19,9 @@ class Admin::UsersController < AdminController
def team_update def team_update
@admin_user = User.find(params[:id]) @admin_user = User.find(params[:id])
UsersProject.user_bulk_import( UsersProject.add_users_into_projects(
@admin_user,
params[:project_ids], params[:project_ids],
[@admin_user.id],
params[:project_access] params[:project_access]
) )
......
...@@ -22,7 +22,7 @@ class TreeController < ProjectResourceController ...@@ -22,7 +22,7 @@ class TreeController < ProjectResourceController
end end
def edit def edit
@last_commit = @project.last_commit_for(@ref, @path).sha @last_commit = @project.repository.last_commit_for(@ref, @path).sha
end end
def update def update
......
...@@ -128,16 +128,6 @@ class UsersProject < ActiveRecord::Base ...@@ -128,16 +128,6 @@ class UsersProject < ActiveRecord::Base
end end
end end
# TODO: depreceate in future in favor of add_users_into_projects
def bulk_import(project, user_ids, project_access)
add_users_into_projects([project.id], user_ids, project_access)
end
# TODO: depreceate in future in favor of add_users_into_projects
def user_bulk_import(user, project_ids, project_access)
add_users_into_projects(project_ids, [user.id], project_access)
end
def roles_hash def roles_hash
{ {
guest: GUEST, guest: GUEST,
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
%td %td
= link_to project_commits_path(@project, branch.name) do = link_to project_commits_path(@project, branch.name) do
%strong= branch.name %strong= branch.name
- if branch.name == @project.root_ref - if @project.root_ref?(branch.name)
%span.label default %span.label default
%td %td
- if branch.commit - if branch.commit
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= link_to project_commits_path(@project, commit.head.name) do = link_to project_commits_path(@project, commit.head.name) do
%strong %strong
= commit.head.name = commit.head.name
- if commit.head.name == @project.root_ref - if @project.root_ref?(commit.head.name)
%span.label default %span.label default
%td %td
......
...@@ -3,13 +3,13 @@ class CreateProject < Spinach::FeatureSteps ...@@ -3,13 +3,13 @@ class CreateProject < Spinach::FeatureSteps
include SharedPaths include SharedPaths
And 'fill project form with valid data' do And 'fill project form with valid data' do
fill_in 'project_name', :with => 'NewProject' fill_in 'project_name', with: 'Empty'
click_button "Create project" click_button "Create project"
end end
Then 'I should see project page' do Then 'I should see project page' do
current_path.should == project_path(Project.last) current_path.should == project_path(Project.last)
page.should have_content "NewProject" page.should have_content "Empty"
end end
And 'I should see empty project instuctions' do And 'I should see empty project instuctions' do
......
...@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps ...@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
page.should have_selector('ul.breadcrumb span.divider', count: 3) page.should have_selector('ul.breadcrumb span.divider', count: 3)
page.should have_selector('ul.breadcrumb a', count: 4) page.should have_selector('ul.breadcrumb a', count: 4)
find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path}\/commits\/master\z/) find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
end end
......
require 'spec_helper' require 'spec_helper'
describe Commit do describe Commit do
let(:commit) { create(:project).commit } let(:commit) { create(:project).repository.commit }
describe CommitDecorator do describe CommitDecorator do
let(:decorator) { CommitDecorator.new(commit) } let(:decorator) { CommitDecorator.new(commit) }
......
require "repository"
require "project"
# Stubs out all Git repository access done by models so that specs can run # Stubs out all Git repository access done by models so that specs can run
# against fake repositories without Grit complaining that they don't exist. # against fake repositories without Grit complaining that they don't exist.
class Project class Project
def repository
if path == "empty" || !path
nil
else
GitLabTestRepo.new(path_with_namespace)
end
end
def satellite def satellite
FakeSatellite.new FakeSatellite.new
end end
...@@ -16,7 +27,7 @@ class Project ...@@ -16,7 +27,7 @@ class Project
end end
end end
class Repository class GitLabTestRepo < Repository
def repo def repo
@repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq')) @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
end end
......
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