Epic: Gitlab configuration with default values
This commit is contained in:
parent
b3a0ee8e63
commit
9b337b8328
25 changed files with 147 additions and 45 deletions
|
@ -158,6 +158,11 @@ table {
|
|||
&.small {
|
||||
@extend .btn-small;
|
||||
}
|
||||
|
||||
&.active {
|
||||
border-color:#aaa;
|
||||
background-color:#ccc;
|
||||
}
|
||||
}
|
||||
|
||||
a:focus {
|
||||
|
|
|
@ -13,7 +13,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def web_app_url
|
||||
"#{request_protocol}://#{GIT_HOST["host"]}/"
|
||||
"#{request_protocol}://#{Gitlab.config.web_host}/"
|
||||
end
|
||||
|
||||
def last_commit(project)
|
||||
|
|
|
@ -2,10 +2,10 @@ class Notify < ActionMailer::Base
|
|||
include Resque::Mailer
|
||||
add_template_helper ApplicationHelper
|
||||
|
||||
default_url_options[:host] = EMAIL_OPTS["host"]
|
||||
default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call
|
||||
default_url_options[:host] = Gitlab.config.web_host
|
||||
default_url_options[:protocol] = Gitlab.config.web_protocol
|
||||
|
||||
default from: EMAIL_OPTS["from"]
|
||||
default from: Gitlab.config.email_from
|
||||
|
||||
def new_user_email(user_id, password)
|
||||
@user = User.find(user_id)
|
||||
|
|
|
@ -113,7 +113,7 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def web_url
|
||||
[GIT_HOST['host'], code].join("/")
|
||||
[Gitlab.config.url, code].join("/")
|
||||
end
|
||||
|
||||
def common_notes
|
||||
|
|
|
@ -73,7 +73,7 @@ module GitPush
|
|||
id: commit.id,
|
||||
message: commit.safe_message,
|
||||
timestamp: commit.date.xmlschema,
|
||||
url: "http://#{GIT_HOST['host']}/#{code}/commits/#{commit.id}",
|
||||
url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
|
||||
author: {
|
||||
name: commit.author_name,
|
||||
email: commit.author_email
|
||||
|
|
|
@ -68,7 +68,7 @@ module Repository
|
|||
end
|
||||
|
||||
def path_to_repo
|
||||
File.join(GIT_HOST["base_path"], "#{path}.git")
|
||||
File.join(Gitlab.config.git_base_path, "#{path}.git")
|
||||
end
|
||||
|
||||
def update_repository
|
||||
|
@ -141,4 +141,12 @@ module Repository
|
|||
|
||||
file_path
|
||||
end
|
||||
|
||||
def ssh_url_to_repo
|
||||
url_to_repo
|
||||
end
|
||||
|
||||
def http_url_to_repo
|
||||
http_url = [Gitlab.config.url, "/", path, ".git"].join()
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
Path
|
||||
.input
|
||||
.input-prepend
|
||||
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:"
|
||||
%span.add-on= Gitlab.config.ssh_path
|
||||
= f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
|
||||
.clearfix
|
||||
= f.label :code do
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
Git Clone
|
||||
.input
|
||||
.input-prepend
|
||||
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:"
|
||||
%span.add-on= Gitlab.config.ssh_path
|
||||
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
|
||||
%span.add-on= ".git"
|
||||
.clearfix
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
Git Clone
|
||||
.input
|
||||
.input-prepend
|
||||
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:"
|
||||
%span.add-on= Gitlab.config.ssh_path
|
||||
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
|
||||
%span.add-on= ".git"
|
||||
.clearfix
|
||||
|
|
|
@ -4,8 +4,11 @@
|
|||
.row
|
||||
.span7
|
||||
.form-horizontal
|
||||
.input-prepend
|
||||
.input-prepend.project_clone_holder
|
||||
|
||||
%span.add-on git clone
|
||||
= link_to "SSH", "#", :class => "btn small active", :"data-clone" => @project.ssh_url_to_repo
|
||||
= link_to "HTTP", "#", :class => "btn small", :"data-clone" => @project.http_url_to_repo
|
||||
= text_field_tag :project_clone, @project.url_to_repo, :class => "one_click_select span5"
|
||||
.span4.right
|
||||
.right
|
||||
|
@ -23,4 +26,12 @@
|
|||
= render "events/event_last_push", :event => @last_push
|
||||
.content_list= render @events
|
||||
|
||||
|
||||
:javascript
|
||||
$(function(){
|
||||
var link_sel = ".project_clone_holder a";
|
||||
$(link_sel).bind("click", function() {
|
||||
$(link_sel).removeClass("active");
|
||||
$(this).addClass("active");
|
||||
$("#project_clone").val($(this).attr("data-clone"));
|
||||
})
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue