From 9a9250f6e1bd1da437fe80d429754fec1d03fe65 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 8 Nov 2016 16:40:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fork=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/forked_pop.js.erb | 2 +- app/views/repositories/_forked_popbox.html.erb | 1 + app/views/repositories/forked_popbox.html.erb | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 app/views/repositories/_forked_popbox.html.erb delete mode 100644 app/views/repositories/forked_popbox.html.erb diff --git a/app/views/projects/forked_pop.js.erb b/app/views/projects/forked_pop.js.erb index 8a5705501..4519ea386 100644 --- a/app/views/projects/forked_pop.js.erb +++ b/app/views/projects/forked_pop.js.erb @@ -1,3 +1,3 @@ var htmlvalue = "<%= escape_javascript(render :partial => 'repositories/forked_popbox') %>"; -pop_box_new(htmlvalue,820,316); +pop_box_new(htmlvalue,320,316); diff --git a/app/views/repositories/_forked_popbox.html.erb b/app/views/repositories/_forked_popbox.html.erb new file mode 100644 index 000000000..ed4df3c90 --- /dev/null +++ b/app/views/repositories/_forked_popbox.html.erb @@ -0,0 +1 @@ +666 \ No newline at end of file diff --git a/app/views/repositories/forked_popbox.html.erb b/app/views/repositories/forked_popbox.html.erb deleted file mode 100644 index 9ed28d5e0..000000000 --- a/app/views/repositories/forked_popbox.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -
-
-

新建里程碑

- -
-
-
From 2122a06608fc5c7d7e2e7fea7fc9f31efb29630a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 8 Nov 2016 17:12:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=A4=A7?= =?UTF-8?q?=E5=86=99=E8=BD=AC=E5=B0=8F=E5=86=99=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 146f49219..b12219f8a 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -265,6 +265,7 @@ update end @repository.project = @project @repository.type = 'Repository::Gitlab' + @repository.identifier = @repository.identifier.downcase @repository.url = @repository.identifier if request.post? && @repository.save s = Trustie::Gitlab::Sync.new From a8575c3476de09a280cafab16f2bca44b57f9907 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 8 Nov 2016 17:31:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=20=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=98=BE=E7=A4=BA=E5=8F=8A=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/_link_to_functions.html.erb | 30 ++++++++++++------- app/views/repositories/changes.html.erb | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb index 0e777217f..e1fc50330 100644 --- a/app/views/repositories/_link_to_functions.html.erb +++ b/app/views/repositories/_link_to_functions.html.erb @@ -1,15 +1,25 @@ <% if @entry && @entry.kind == 'file' %> -<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%> -<%# if @repository.supports_cat? %> - <%#= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr" %> -<%# end %> + <% if action_name != 'entry' %> + <%= link_to l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%> + <% else %> + <%= l(:label_history) %> + <% end %> + + <% if @repository.supports_cat? %> + <% if action_name != 'entry' %> + <%= link_to l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5" %> + <% else %> + <%= l(:button_view) %> + <% end %> + + <% end %> <%# if @repository.supports_annotate? %> <%#= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> <%# end %> -<%= link_to(l(:button_download), - {:action => 'raw', :id => @project, - :repository_id => @repository.identifier_param, - :path => to_path_param(@path), - :rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %> -<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %> + <%= link_to(l(:button_download), + {:action => 'raw', :id => @project, + :repository_id => @repository.identifier_param, + :path => to_path_param(@path), + :rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %> + <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %> <% end %> diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index de33f0469..f634a0285 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -9,7 +9,7 @@
- <%#= render :partial => 'link_to_functions' %> + <%= render :partial => 'link_to_functions' %> <%= render_properties(@properties) %>