Merge branch 'master' into fixes/api
This commit is contained in:
commit
375caeefcf
29 changed files with 224 additions and 94 deletions
|
@ -20,6 +20,7 @@
|
|||
.hint { font-style: italic; color: #999; }
|
||||
.light { color: #888 }
|
||||
.tiny { font-weight: normal }
|
||||
.vtop { vertical-align: top; }
|
||||
|
||||
|
||||
/** ALERT MESSAGES **/
|
||||
|
|
|
@ -7,10 +7,20 @@ class GraphController < ProjectResourceController
|
|||
before_filter :require_non_empty_project
|
||||
|
||||
def show
|
||||
if params.has_key?(:q) && params[:q].blank?
|
||||
redirect_to project_graph_path(@project, params[:id])
|
||||
return
|
||||
end
|
||||
|
||||
if params.has_key?(:q)
|
||||
@q = params[:q]
|
||||
@commit = @project.repository.commit(@q) || @commit
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json do
|
||||
graph = Gitlab::Graph::JsonBuilder.new(project, @ref)
|
||||
graph = Gitlab::Graph::JsonBuilder.new(project, @ref, @commit)
|
||||
render :json => graph.to_json
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ class Public::ProjectsController < ApplicationController
|
|||
layout 'public'
|
||||
|
||||
def index
|
||||
@projects = Project.public
|
||||
@projects = Project.public_only
|
||||
@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,6 +1,17 @@
|
|||
class RegistrationsController < Devise::RegistrationsController
|
||||
before_filter :signup_enabled?
|
||||
|
||||
def destroy
|
||||
if current_user.owned_projects.count > 0
|
||||
redirect_to account_profile_path, alert: "Remove projects and groups before removing account." and return
|
||||
end
|
||||
current_user.destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to new_user_session_path, notice: "Account successfully removed." }
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def signup_enabled?
|
||||
|
|
|
@ -19,12 +19,12 @@ module Issuable
|
|||
validates :title, presence: true, length: { within: 0..255 }
|
||||
validates :closed, inclusion: { in: [true, false] }
|
||||
|
||||
scope :opened, where(closed: false)
|
||||
scope :closed, where(closed: true)
|
||||
scope :opened, -> { where(closed: false) }
|
||||
scope :closed, -> { where(closed: true) }
|
||||
scope :of_group, ->(group) { where(project_id: group.project_ids) }
|
||||
scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
|
||||
scope :assigned, ->(u) { where(assignee_id: u.id)}
|
||||
scope :recent, order("created_at DESC")
|
||||
scope :recent, -> { order("created_at DESC") }
|
||||
|
||||
delegate :name,
|
||||
:email,
|
||||
|
|
|
@ -42,8 +42,8 @@ class Event < ActiveRecord::Base
|
|||
serialize :data
|
||||
|
||||
# Scopes
|
||||
scope :recent, order("created_at DESC")
|
||||
scope :code_push, where(action: Pushed)
|
||||
scope :recent, -> { order("created_at DESC") }
|
||||
scope :code_push, -> { where(action: Pushed) }
|
||||
scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent }
|
||||
|
||||
class << self
|
||||
|
|
|
@ -20,8 +20,8 @@ class Milestone < ActiveRecord::Base
|
|||
has_many :issues
|
||||
has_many :merge_requests
|
||||
|
||||
scope :active, where(closed: false)
|
||||
scope :closed, where(closed: true)
|
||||
scope :active, -> { where(closed: false) }
|
||||
scope :closed, -> { where(closed: true) }
|
||||
|
||||
validates :title, presence: true
|
||||
validates :project, presence: true
|
||||
|
|
|
@ -29,7 +29,7 @@ class Namespace < ActiveRecord::Base
|
|||
after_update :move_dir
|
||||
after_destroy :rm_dir
|
||||
|
||||
scope :root, where('type IS NULL')
|
||||
scope :root, -> { where('type IS NULL') }
|
||||
|
||||
def self.search query
|
||||
where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
|
||||
|
|
|
@ -43,8 +43,8 @@ class Note < ActiveRecord::Base
|
|||
|
||||
# Scopes
|
||||
scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
|
||||
scope :inline, where("line_code IS NOT NULL")
|
||||
scope :not_inline, where("line_code IS NULL")
|
||||
scope :inline, -> { where("line_code IS NOT NULL") }
|
||||
scope :not_inline, -> { where("line_code IS NULL") }
|
||||
|
||||
scope :common, ->{ where(noteable_type: ["", nil]) }
|
||||
scope :fresh, ->{ order("created_at ASC, id ASC") }
|
||||
|
|
|
@ -91,7 +91,7 @@ class Project < ActiveRecord::Base
|
|||
scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
|
||||
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
|
||||
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
|
||||
scope :public, where(public: true)
|
||||
scope :public_only, -> { where(public: true) }
|
||||
|
||||
class << self
|
||||
def abandoned
|
||||
|
|
|
@ -31,9 +31,9 @@ class Snippet < ActiveRecord::Base
|
|||
validates :content, presence: true
|
||||
|
||||
# Scopes
|
||||
scope :fresh, order("created_at DESC")
|
||||
scope :non_expired, where(["expires_at IS NULL OR expires_at > ?", Time.current])
|
||||
scope :expired, where(["expires_at IS NOT NULL AND expires_at < ?", Time.current])
|
||||
scope :fresh, -> { order("created_at DESC") }
|
||||
scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
|
||||
scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
|
||||
|
||||
def self.content_types
|
||||
[
|
||||
|
|
|
@ -87,10 +87,10 @@ class User < ActiveRecord::Base
|
|||
delegate :path, to: :namespace, allow_nil: true, prefix: true
|
||||
|
||||
# Scopes
|
||||
scope :admins, where(admin: true)
|
||||
scope :blocked, where(blocked: true)
|
||||
scope :active, where(blocked: false)
|
||||
scope :alphabetically, order('name ASC')
|
||||
scope :admins, -> { where(admin: true) }
|
||||
scope :blocked, -> { where(blocked: true) }
|
||||
scope :active, -> { where(blocked: false) }
|
||||
scope :alphabetically, -> { order('name ASC') }
|
||||
scope :in_team, ->(team){ where(id: team.member_ids) }
|
||||
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
|
||||
scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active }
|
||||
|
|
|
@ -32,10 +32,10 @@ class UsersProject < ActiveRecord::Base
|
|||
|
||||
delegate :name, :username, :email, to: :user, prefix: true
|
||||
|
||||
scope :guests, where(project_access: GUEST)
|
||||
scope :reporters, where(project_access: REPORTER)
|
||||
scope :developers, where(project_access: DEVELOPER)
|
||||
scope :masters, where(project_access: MASTER)
|
||||
scope :guests, -> { where(project_access: GUEST) }
|
||||
scope :reporters, -> { where(project_access: REPORTER) }
|
||||
scope :developers, -> { where(project_access: DEVELOPER) }
|
||||
scope :masters, -> { where(project_access: MASTER) }
|
||||
|
||||
scope :in_project, ->(project) { where(project_id: project.id) }
|
||||
scope :in_projects, ->(projects) { where(project_id: project_ids) }
|
||||
|
|
|
@ -11,17 +11,17 @@
|
|||
.clearfix
|
||||
= f.label :name
|
||||
.input
|
||||
= f.text_field :name, required: true
|
||||
= f.text_field :name, required: true, autocomplete: "off"
|
||||
%span.help-inline * required
|
||||
.clearfix
|
||||
= f.label :username
|
||||
.input
|
||||
= f.text_field :username, required: true
|
||||
= f.text_field :username, required: true, autocomplete: "off"
|
||||
%span.help-inline * required
|
||||
.clearfix
|
||||
= f.label :email
|
||||
.input
|
||||
= f.text_field :email, required: true
|
||||
= f.text_field :email, required: true, autocomplete: "off"
|
||||
%span.help-inline * required
|
||||
|
||||
%fieldset
|
||||
|
|
16
app/views/graph/_head.html.haml
Normal file
16
app/views/graph/_head.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
|||
%h3.page_title Project Network Graph
|
||||
%hr
|
||||
|
||||
.clearfix
|
||||
.pull-left
|
||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
|
||||
|
||||
.search.pull-right
|
||||
= form_tag project_graph_path(@project, params[:id]), method: :get do |f|
|
||||
.control-group
|
||||
= label_tag :search , "Looking for commit:", class: 'control-label light'
|
||||
.controls
|
||||
= text_field_tag :q, @q, placeholder: "Input SHA", class: "search-input xlarge"
|
||||
= button_tag type: 'submit', class: 'btn vtop' do
|
||||
%i.icon-search
|
||||
|
|
@ -1,7 +1,4 @@
|
|||
%h3.page_title Project Network Graph
|
||||
%br
|
||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
|
||||
%br
|
||||
= render "head"
|
||||
.graph_holder
|
||||
%h4
|
||||
%small You can move around the graph by using the arrow keys.
|
||||
|
@ -12,8 +9,9 @@
|
|||
var branch_graph;
|
||||
$(function(){
|
||||
branch_graph = new BranchGraph($("#holder"), {
|
||||
url: '#{project_graph_path(@project, @ref, format: :json)}',
|
||||
url: '#{project_graph_path(@project, @ref, q: @q, format: :json)}',
|
||||
commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
|
||||
ref: '#{@ref}'
|
||||
ref: '#{@ref}',
|
||||
commit_id: '#{@commit.id}'
|
||||
});
|
||||
});
|
||||
|
|
|
@ -77,4 +77,10 @@
|
|||
.input
|
||||
= f.submit 'Save username', class: "btn btn-save"
|
||||
|
||||
|
||||
- if Gitlab.config.gitlab.signup_enabled
|
||||
%fieldset.remove-account
|
||||
%legend
|
||||
Remove account
|
||||
%small.cred.pull-right
|
||||
Before removing the account you must remove all projects!
|
||||
= link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
|
|
@ -167,12 +167,12 @@ Gitlab::Application.routes.draw do
|
|||
get "files"
|
||||
end
|
||||
|
||||
resources :blob, only: [:show], constraints: {id: /.+/}
|
||||
resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
|
||||
resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
|
||||
resources :commits, only: [:show], constraints: {id: /.+/}
|
||||
resources :compare, only: [:index, :create]
|
||||
resources :blame, only: [:show], constraints: {id: /.+/}
|
||||
resources :blob, only: [:show], constraints: {id: /.+/}
|
||||
resources :graph, only: [:show], constraints: {id: /.+/}
|
||||
match "/compare/:from...:to" => "compare#show", as: "compare",
|
||||
:via => [:get, :post], constraints: {from: /.+/, to: /.+/}
|
||||
|
|
|
@ -79,6 +79,9 @@ Parameters:
|
|||
}
|
||||
```
|
||||
|
||||
Will return status code `200` on success or `404 Not found` if the branch is not available.
|
||||
|
||||
|
||||
## Protect a project repository branch
|
||||
|
||||
Protect a single project repository branch.
|
||||
|
|
|
@ -265,6 +265,7 @@ module Gitlab
|
|||
# GET /projects/:id/repository/branches/:branch
|
||||
get ":id/repository/branches/:branch" do
|
||||
@branch = user_project.repo.heads.find { |item| item.name == params[:branch] }
|
||||
not_found!("Branch does not exist") if @branch.nil?
|
||||
present @branch, with: Entities::RepoObject, project: user_project
|
||||
end
|
||||
|
||||
|
|
|
@ -117,7 +117,10 @@ module ExtractsPath
|
|||
|
||||
@id = File.join(@ref, @path)
|
||||
|
||||
@commit = CommitDecorator.decorate(@project.repository.commit(@ref))
|
||||
# It is used "@project.repository.commits(@ref, @path, 1, 0)",
|
||||
# because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
|
||||
commits = @project.repository.commits(@ref, @path, 1, 0)
|
||||
@commit = CommitDecorator.decorate(commits.first)
|
||||
|
||||
@tree = Tree.new(@commit.tree, @ref, @path)
|
||||
@tree = TreeDecorator.new(@tree)
|
||||
|
|
|
@ -9,9 +9,10 @@ module Gitlab
|
|||
@max_count ||= 650
|
||||
end
|
||||
|
||||
def initialize project, ref
|
||||
def initialize project, ref, commit
|
||||
@project = project
|
||||
@ref = ref
|
||||
@commit = commit
|
||||
@repo = project.repo
|
||||
@ref_cache = {}
|
||||
|
||||
|
@ -31,7 +32,8 @@ module Gitlab
|
|||
# Get commits from repository
|
||||
#
|
||||
def collect_commits
|
||||
@commits = Grit::Commit.find_all(repo, nil, {max_count: self.class.max_count}).dup
|
||||
|
||||
@commits = Grit::Commit.find_all(repo, nil, {topo_order: true, max_count: self.class.max_count, skip: to_commit}).dup
|
||||
|
||||
# Decorate with app/models/commit.rb
|
||||
@commits.map! { |commit| ::Commit.new(commit) }
|
||||
|
@ -49,41 +51,28 @@ module Gitlab
|
|||
# list of commits. As well as returns date list
|
||||
# corelated with time set on commits.
|
||||
#
|
||||
# @param [Array<Graph::Commit>] comits to index
|
||||
# @param [Array<Graph::Commit>] commits to index
|
||||
#
|
||||
# @return [Array<TimeDate>] list of commit dates corelated with time on commits
|
||||
def index_commits
|
||||
days, heads, times = [], [], []
|
||||
days, times = [], []
|
||||
map = {}
|
||||
|
||||
commits.reverse.each_with_index do |c,i|
|
||||
c.time = i
|
||||
days[i] = c.committed_date
|
||||
map[c.id] = c
|
||||
heads += c.refs unless c.refs.nil?
|
||||
times[i] = c
|
||||
end
|
||||
|
||||
heads.select!{|h| h.is_a? Grit::Head or h.is_a? Grit::Remote}
|
||||
# sort heads so the master is top and current branches are closer
|
||||
heads.sort! do |a,b|
|
||||
if a.name == @ref
|
||||
-1
|
||||
elsif b.name == @ref
|
||||
1
|
||||
else
|
||||
b.commit.committed_date <=> a.commit.committed_date
|
||||
end
|
||||
end
|
||||
|
||||
@_reserved = {}
|
||||
days.each_index do |i|
|
||||
@_reserved[i] = []
|
||||
end
|
||||
|
||||
heads.each do |h|
|
||||
if map.include? h.commit.id then
|
||||
place_chain(map[h.commit.id], map)
|
||||
commits_sort_by_ref.each do |commit|
|
||||
if map.include? commit.id then
|
||||
place_chain(map[commit.id], map)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -95,6 +84,45 @@ module Gitlab
|
|||
days
|
||||
end
|
||||
|
||||
# Skip count that the target commit is displayed in center.
|
||||
def to_commit
|
||||
commits = Grit::Commit.find_all(repo, nil, {topo_order: true})
|
||||
commit_index = commits.index do |c|
|
||||
c.id == @commit.id
|
||||
end
|
||||
|
||||
if commit_index && (self.class.max_count / 2 < commit_index) then
|
||||
# get max index that commit is displayed in the center.
|
||||
commit_index - self.class.max_count / 2
|
||||
else
|
||||
0
|
||||
end
|
||||
end
|
||||
|
||||
def commits_sort_by_ref
|
||||
commits.sort do |a,b|
|
||||
if include_ref?(a)
|
||||
-1
|
||||
elsif include_ref?(b)
|
||||
1
|
||||
else
|
||||
b.committed_date <=> a.committed_date
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def include_ref?(commit)
|
||||
heads = commit.refs.select do |ref|
|
||||
ref.is_a?(Grit::Head) or ref.is_a?(Grit::Remote) or ref.is_a?(Grit::Tag)
|
||||
end
|
||||
|
||||
heads.map! do |head|
|
||||
head.name
|
||||
end
|
||||
|
||||
heads.include?(@ref)
|
||||
end
|
||||
|
||||
def find_free_parent_spaces(commit, map, times)
|
||||
spaces = []
|
||||
|
||||
|
|
|
@ -311,7 +311,7 @@ namespace :gitlab do
|
|||
"Remove \"-e \" so the line starts with PATH"
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section("Gitolite"),
|
||||
see_installation_guide_section("Gitlab Shell"),
|
||||
"https://github.com/gitlabhq/gitlabhq/issues/1059"
|
||||
)
|
||||
fix_and_rerun
|
||||
|
@ -368,10 +368,10 @@ namespace :gitlab do
|
|||
|
||||
|
||||
namespace :gitlab_shell do
|
||||
desc "GITLAB | Check the configuration of Gitolite"
|
||||
desc "GITLAB | Check the configuration of Gitlab Shell"
|
||||
task check: :environment do
|
||||
warn_user_is_not_gitlab
|
||||
start_checking "Gitolite"
|
||||
start_checking "Gitlab Shell"
|
||||
|
||||
check_repo_base_exists
|
||||
check_repo_base_is_not_symlink
|
||||
|
@ -380,7 +380,7 @@ namespace :gitlab do
|
|||
check_post_receive_hook_is_up_to_date
|
||||
check_repos_post_receive_hooks_is_link
|
||||
|
||||
finished_checking "Gitolite"
|
||||
finished_checking "Gitlab Shell"
|
||||
end
|
||||
|
||||
|
||||
|
@ -392,7 +392,7 @@ namespace :gitlab do
|
|||
print "post-receive hook up-to-date? ... "
|
||||
|
||||
hook_file = "post-receive"
|
||||
gitlab_shell_hooks_path = File.join(Gitlab.config.gitlab_shell.hooks_path, "common")
|
||||
gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
|
||||
gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
|
||||
gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
|
||||
|
||||
|
@ -401,22 +401,7 @@ namespace :gitlab do
|
|||
return
|
||||
end
|
||||
|
||||
gitlab_shell_hook_content = File.read(gitlab_shell_hook_file)
|
||||
gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file)
|
||||
gitlab_hook_content = File.read(gitlab_hook_file)
|
||||
|
||||
if gitlab_shell_hook_content == gitlab_hook_content
|
||||
puts "yes".green
|
||||
else
|
||||
puts "no".red
|
||||
try_fixing_it(
|
||||
"sudo -u #{gitlab_shell_ssh_user} cp #{gitlab_hook_file} #{gitlab_shell_hook_file}"
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section "Setup GitLab Hooks"
|
||||
)
|
||||
fix_and_rerun
|
||||
end
|
||||
puts "yes".green
|
||||
end
|
||||
|
||||
def check_repo_base_exists
|
||||
|
@ -430,12 +415,12 @@ namespace :gitlab do
|
|||
puts "no".red
|
||||
puts "#{repo_base_path} is missing".red
|
||||
try_fixing_it(
|
||||
"This should have been created when setting up Gitolite.",
|
||||
"This should have been created when setting up Gitlab Shell.",
|
||||
"Make sure it's set correctly in config/gitlab.yml",
|
||||
"Make sure Gitolite is installed correctly."
|
||||
"Make sure Gitlab Shell is installed correctly."
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section "Gitolite"
|
||||
see_installation_guide_section "Gitlab Shell"
|
||||
)
|
||||
fix_and_rerun
|
||||
end
|
||||
|
@ -480,7 +465,7 @@ namespace :gitlab do
|
|||
"find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s"
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section "Gitolite"
|
||||
see_installation_guide_section "Gitlab Shell"
|
||||
)
|
||||
fix_and_rerun
|
||||
end
|
||||
|
@ -506,7 +491,7 @@ namespace :gitlab do
|
|||
"sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}"
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section "Gitolite"
|
||||
see_installation_guide_section "Gitlab Shell"
|
||||
)
|
||||
fix_and_rerun
|
||||
end
|
||||
|
@ -516,7 +501,7 @@ namespace :gitlab do
|
|||
print "post-receive hooks in repos are links: ... "
|
||||
|
||||
hook_file = "post-receive"
|
||||
gitlab_shell_hooks_path = File.join(Gitlab.config.gitlab_shell.hooks_path, "common")
|
||||
gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
|
||||
gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
|
||||
gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
|
||||
|
||||
|
@ -545,7 +530,7 @@ namespace :gitlab do
|
|||
"sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
|
||||
)
|
||||
for_more_information(
|
||||
"lib/support/rewrite-hooks.sh"
|
||||
"#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh"
|
||||
)
|
||||
fix_and_rerun
|
||||
next
|
||||
|
@ -555,7 +540,7 @@ namespace :gitlab do
|
|||
File.realpath(project_hook_file) == File.realpath(gitlab_shell_hook_file)
|
||||
puts "ok".green
|
||||
else
|
||||
puts "not a link to Gitolite's hook".red
|
||||
puts "not a link to Gitlab Shell's hook".red
|
||||
try_fixing_it(
|
||||
"sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
|
||||
)
|
||||
|
@ -577,7 +562,7 @@ namespace :gitlab do
|
|||
end
|
||||
|
||||
def gitlab_shell_version
|
||||
gitlab_shell_version_file = "#{gitlab_shell_user_home}/gitlab_shell/src/VERSION"
|
||||
gitlab_shell_version_file = "#{gitlab_shell_user_home}/gitlab-shell/VERSION"
|
||||
if File.readable?(gitlab_shell_version_file)
|
||||
File.read(gitlab_shell_version_file)
|
||||
end
|
||||
|
|
|
@ -8,7 +8,12 @@ namespace :sidekiq do
|
|||
task :start do
|
||||
run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
|
||||
end
|
||||
|
||||
|
||||
desc "GITLAB | Start sidekiq with launchd on Mac OS X"
|
||||
task :launchd do
|
||||
run "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1"
|
||||
end
|
||||
|
||||
def pidfile
|
||||
Rails.root.join("tmp", "pids", "sidekiq.pid")
|
||||
end
|
||||
|
|
|
@ -123,7 +123,7 @@ FactoryGirl.define do
|
|||
factory :event do
|
||||
factory :closed_issue_event do
|
||||
project
|
||||
action Event::Closed
|
||||
action { Event::Closed }
|
||||
target factory: :closed_issue
|
||||
author factory: :user
|
||||
end
|
||||
|
|
|
@ -115,6 +115,11 @@ describe Gitlab::API do
|
|||
json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1'
|
||||
json_response['protected'].should == false
|
||||
end
|
||||
|
||||
it "should return a 404 error if branch is not available" do
|
||||
get api("/projects/#{project.id}/repository/branches/unknown", user)
|
||||
response.status.should == 404
|
||||
end
|
||||
end
|
||||
|
||||
describe "PUT /projects/:id/repository/branches/:branch/protect" do
|
||||
|
|
48
spec/requests/profile_spec.rb
Normal file
48
spec/requests/profile_spec.rb
Normal file
|
@ -0,0 +1,48 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe "Profile account page" do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
login_as :user
|
||||
end
|
||||
|
||||
describe "when signup is enabled" do
|
||||
before do
|
||||
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
|
||||
visit account_profile_path
|
||||
end
|
||||
it { page.should have_content("Remove account") }
|
||||
|
||||
it "should delete the account", js: true do
|
||||
expect { click_link "Delete account" }.to change {User.count}.by(-1)
|
||||
current_path.should == new_user_session_path
|
||||
end
|
||||
end
|
||||
|
||||
describe "when signup is enabled and user has a project" do
|
||||
before do
|
||||
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
|
||||
@project = create(:project, namespace: @user.namespace)
|
||||
@project.team << [@user, :master]
|
||||
visit account_profile_path
|
||||
end
|
||||
it { page.should have_content("Remove account") }
|
||||
|
||||
it "should not allow user to delete the account" do
|
||||
expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
|
||||
end
|
||||
end
|
||||
|
||||
describe "when signup is disabled" do
|
||||
before do
|
||||
Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
|
||||
visit account_profile_path
|
||||
end
|
||||
|
||||
it "should not have option to remove account" do
|
||||
page.should_not have_content("Remove account")
|
||||
current_path.should == account_profile_path
|
||||
end
|
||||
end
|
||||
end
|
|
@ -392,6 +392,7 @@ end
|
|||
describe BlobController, "routing" do
|
||||
it "to #show" do
|
||||
get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
|
||||
get("/gitlabhq/blob/master/app/models/compare.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/compare.rb')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
21
vendor/assets/javascripts/branch-graph.js
vendored
21
vendor/assets/javascripts/branch-graph.js
vendored
|
@ -161,14 +161,23 @@
|
|||
|
||||
if (this.commits[i].refs) {
|
||||
this.appendLabel(x, y, this.commits[i].refs);
|
||||
|
||||
// The main branch is displayed in the center.
|
||||
re = new RegExp('(^| )' + this.options.ref + '( |$)');
|
||||
if (this.commits[i].refs.match(re)) {
|
||||
scrollLeft = x - graphWidth / 2;
|
||||
}
|
||||
}
|
||||
|
||||
// mark commit and displayed in the center
|
||||
if (this.commits[i].id == this.options.commit_id) {
|
||||
r.path([
|
||||
'M', x, y - 5,
|
||||
'L', x + 4, y - 15,
|
||||
'L', x - 4, y - 15,
|
||||
'Z'
|
||||
]).attr({
|
||||
"fill": "#000",
|
||||
"fill-opacity": .7,
|
||||
"stroke": "none"
|
||||
});
|
||||
scrollLeft = x - graphWidth / 2;
|
||||
}
|
||||
|
||||
this.appendAnchor(top, this.commits[i], x, y);
|
||||
}
|
||||
top.toFront();
|
||||
|
|
Loading…
Reference in a new issue