From 9d91e85fe4a52897ddd6dc2293d9866a39dc3e22 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 14:19:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?#863=20=E5=A2=9E=E5=8A=A0=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=BF=9C=E7=A8=8B=E5=88=86=E6=94=AF=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=88=87=E6=8D=A2=E5=88=B0=E8=AF=A5=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=9A=84=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 132 ++++++++++++++++----------- 1 file changed, 77 insertions(+), 55 deletions(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index d11fd2564..570f87064 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -7,79 +7,93 @@ <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
- (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| - link_to h(repo.name), - {:controller => 'repositories', :action => 'show', - :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, - :class => 'repository' + (repo == @repository ? ' selected' : '') - }.join(' | ').html_safe %>)
-git init
-git add *
-git commit -m "first commit"
-git remote add origin <%= @repos_url%>
-git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u origin master:master
-git remote add origin <%= @repos_url%>
-git add .
++ (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| + link_to h(repo.name), + {:controller => 'repositories', :action => 'show', + :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, + :class => 'repository' + (repo == @repository ? ' selected' : '') + }.join(' | ').html_safe %>) +
+git init
+git add *
git commit -m "first commit"
+git remote add origin + <%= @repos_url%> +
git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u origin master:master
-git remote add trustie <%= @repos_url%>
+git push -u origin master:master
+git remote add origin <%= @repos_url%>
git add .
git commit -m "first commit"
git config http.postBuffer 524288000 #设置本地post缓存为500MB
-git push -u trustie master:master
-<%= link_to "李海提供", user_path(646)%>
-git push -u origin master:master
+git clone <%= @repos_url%>
+git push
+git checkout -b branch_name
+git push origin branch_name
+git remote add trustie + <%= @repos_url%> +
+git add .
+git commit -m "first commit"
+git config http.postBuffer 524288000 #设置本地post缓存为500MB
+git push -u trustie master:master
+<%= link_to "李海", user_path(646)%>提供
+- <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) - sep = '' %> - <% if @repository.supports_all_revisions? && @path.blank? %> - <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, - :repository_id => @repository.identifier_param %> - <% sep = '|' %> - <% end %> - <% if @repository.supports_directory_revisions? && - ( has_branches || !@path.blank? || !@rev.blank? ) %> - <%= sep %> - <%= link_to l(:label_view_revisions), - :action => 'changes', - :path => to_path_param(@path), - :id => @project, - :repository_id => @repository.identifier_param, - :rev => @rev %> - <% end %> + <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) + sep = '' %> + <% if @repository.supports_all_revisions? && @path.blank? %> + <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, + :repository_id => @repository.identifier_param %> + <% sep = '|' %> + <% end %> + <% if @repository.supports_directory_revisions? && ( has_branches || !@path.blank? || !@rev.blank? ) %> + <%= sep %> + <%= link_to l(:label_view_revisions), + :action => 'changes', + :path => to_path_param(@path), + :id => @project, + :repository_id => @repository.identifier_param, + :rev => @rev %> + <% end %>
<% if @repository.supports_all_revisions? %> <% content_for :header_tags do %> @@ -99,7 +113,15 @@ <% end %> -<%= l(:label_how_commit_code) %> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> | <%= link_to('English', en_usage_path, :class => "usage")%> + + + <%= l(:label_how_commit_code) %> + + + +<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> + | +<%= link_to('English', en_usage_path, :class => "usage")%> From 205c78454f150988d49117eb960bf8bb7013b911 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 28 Oct 2014 14:28:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?#1414=E8=AE=BE=E7=BD=AE=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E8=B4=B4=E5=90=A7=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=94=B9=E4=B8=BA9=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 56 +++++++++++++++++++------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 4fc08d41f..171b2b764 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -56,7 +56,9 @@