From 6c65b91d8c754c61fe8e50966283af5f78c1c9f0 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Tue, 30 Sep 2014 22:28:05 +0200 Subject: [PATCH 1/7] Remove or prepend _ to unused method arguments --- app/controllers/registrations_controller.rb | 4 ++-- app/helpers/tree_helper.rb | 2 +- app/views/projects/tree/_tree.html.haml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 6d3214b70a..9321536e6d 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -15,11 +15,11 @@ class RegistrationsController < Devise::RegistrationsController super end - def after_sign_up_path_for(resource) + def after_sign_up_path_for(_resource) new_user_session_path end - def after_inactive_sign_up_path_for(resource) + def after_inactive_sign_up_path_for(_resource) new_user_session_path end diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index e32aeba5f8..b86275704c 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -108,7 +108,7 @@ module TreeHelper end end - def up_dir_path(tree) + def up_dir_path file = File.join(@path, "..") tree_join(@ref, file) end diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml index 1159fcadff..68ccd4d61b 100644 --- a/app/views/projects/tree/_tree.html.haml +++ b/app/views/projects/tree/_tree.html.haml @@ -35,7 +35,7 @@ - if @path.present? %tr.tree-item %td.tree-item-file-name - = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10' + = link_to "..", project_tree_path(@project, up_dir_path), class: 'prepend-left-10' %td %td.hidden-xs From 5dbe94dc9bda5deceb6957a7e757425874f448de Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 4 Dec 2014 16:31:12 +0100 Subject: [PATCH 2/7] Simplify SSH fingerprint regexp extraction [\d\h] is the same as \h --- app/models/key.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/key.rb b/app/models/key.rb index 095c73d8ba..65a426d1f8 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -89,7 +89,7 @@ class Key < ActiveRecord::Base end if cmd_status.zero? - cmd_output.gsub /([\d\h]{2}:)+[\d\h]{2}/ do |match| + cmd_output.gsub /(\h{2}:)+\h{2}/ do |match| self.fingerprint = match end end From cd688a60111853f63413a87ad6632ad57368e886 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sun, 19 Oct 2014 16:09:38 +0200 Subject: [PATCH 3/7] Replace regex methods by string ones since faster and more readable. --- app/models/commit.rb | 8 ++++---- app/models/project_services/campfire_service.rb | 4 ++-- app/models/project_services/hipchat_service.rb | 4 ++-- app/models/project_services/pushover_service.rb | 4 ++-- app/models/project_services/slack_message.rb | 4 ++-- app/models/user.rb | 2 +- app/services/git_push_service.rb | 8 ++++---- app/services/notification_service.rb | 2 +- lib/api/internal.rb | 4 ++-- lib/tasks/gitlab/import.rake | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/models/commit.rb b/app/models/commit.rb index 37dd371ec0..baccf28674 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -75,11 +75,11 @@ class Commit return no_commit_message if title.blank? - title_end = title.index(/\n/) + title_end = title.index("\n") if (!title_end && title.length > 100) || (title_end && title_end > 100) title[0..79] << "…".html_safe else - title.split(/\n/, 2).first + title.split("\n", 2).first end end @@ -87,11 +87,11 @@ class Commit # # cut off, ellipses (`&hellp;`) are prepended to the commit message. def description - title_end = safe_message.index(/\n/) + title_end = safe_message.index("\n") @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100) "…".html_safe << safe_message[80..-1] else - safe_message.split(/\n/, 2)[1].try(:chomp) + safe_message.split("\n", 2)[1].try(:chomp) end end diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb index 0736ddab99..3116c31105 100644 --- a/app/models/project_services/campfire_service.rb +++ b/app/models/project_services/campfire_service.rb @@ -60,9 +60,9 @@ class CampfireService < Service message << "[#{project.name_with_namespace}] " message << "#{push[:user_name]} " - if before =~ /000000/ + if before.include?('000000') message << "pushed new branch #{ref} \n" - elsif after =~ /000000/ + elsif after.include?('000000') message << "removed branch #{ref} \n" else message << "pushed #{push[:total_commits_count]} commits to #{ref}. " diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index a848d74044..5645a15b14 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -58,12 +58,12 @@ class HipchatService < Service message = "" message << "#{push[:user_name]} " - if before =~ /000000/ + if before.include?('000000') message << "pushed new branch #{ref}"\ " to "\ "#{project.name_with_namespace.gsub!(/\s/, "")}\n" - elsif after =~ /000000/ + elsif after.include?('000000') message << "removed branch #{ref} from #{project.name_with_namespace.gsub!(/\s/,'')} \n" else message << "pushed to branch Date: Tue, 7 Oct 2014 18:54:38 +0200 Subject: [PATCH 4/7] Replace match via get with get on routes --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 1d571e21b8..abd400af1d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -143,8 +143,8 @@ Gitlab::Application.routes.draw do end end - match "/u/:username" => "users#show", as: :user, - constraints: {username: /(?:[^.]|\.(?!atom$))+/, format: /atom/}, via: :get + get '/u/:username' => 'users#show', as: :user, + constraints: { username: /(?:[^.]|\.(?!atom$))+/, format: /atom/ } # # Dashboard Area From 3a3b0da81e2320be890ddb9c00a055ea4c6a305b Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 3 Oct 2014 12:56:48 +0200 Subject: [PATCH 5/7] Make blob new and edit file editors more uniform --- app/views/projects/_blob_editor.html.haml | 15 +++++++++++++++ app/views/projects/edit_tree/show.html.haml | 17 +---------------- app/views/projects/new_tree/show.html.haml | 7 +------ 3 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 app/views/projects/_blob_editor.html.haml diff --git a/app/views/projects/_blob_editor.html.haml b/app/views/projects/_blob_editor.html.haml new file mode 100644 index 0000000000..1fb74b55c4 --- /dev/null +++ b/app/views/projects/_blob_editor.html.haml @@ -0,0 +1,15 @@ +.file-holder.file + .file-title + %i.icon-file + %span.file_name + %span.monospace.light #{ref} + - if local_assigns[:path] + = ': ' + local_assigns[:path] + .file-content.code + %pre.js-edit-mode-pane#editor + = params[:content] || local_assigns[:blob_data] + - if local_assigns[:path] + .js-edit-mode-pane#preview.hide + .center + %h2 + %i.icon-spinner.icon-spin diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml index 5ccde05063..7e0789853a 100644 --- a/app/views/projects/edit_tree/show.html.haml +++ b/app/views/projects/edit_tree/show.html.haml @@ -6,21 +6,7 @@ = link_to editing_preview_title(@blob.name), '#preview', 'data-preview-url' => preview_project_edit_tree_path(@project, @id) = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do - .file-holder.file - .file-title - %i.fa.fa-file - %span.file_name - %span.monospace.light #{@ref}: - = @path - %span.options - .btn-group.tree-btn-group - = link_to "Cancel", @after_edit_path, class: "btn btn-tiny btn-cancel", data: { confirm: leave_edit_message } - .file-content.code - %pre.js-edit-mode-pane#editor - .js-edit-mode-pane#preview.hide - .center - %h2 - %i.fa.fa-spinner.fa-spin + = render 'projects/blob_editor', ref: @ref, path: @path, blob_data: @blob.data = render 'shared/commit_message_container', params: params, placeholder: "Update #{@blob.name}" = hidden_field_tag 'last_commit', @last_commit @@ -34,7 +20,6 @@ ace.config.loadModule("ace/ext/searchbox"); var ace_mode = "#{@blob.language.try(:ace_mode)}"; var editor = ace.edit("editor"); - editor.setValue("#{escape_javascript(@blob.data)}"); if (ace_mode) { editor.getSession().setMode('ace/mode/' + ace_mode); } diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml index f09d365977..cf7b768694 100644 --- a/app/views/projects/new_tree/show.html.haml +++ b/app/views/projects/new_tree/show.html.haml @@ -19,12 +19,7 @@ Encoding .col-sm-10 = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control' - .file-holder - .file-title - %i.fa.fa-file - .file-content.code - %pre#editor= params[:content] - + = render 'projects/blob_editor', ref: @ref = render 'shared/commit_message_container', params: params, placeholder: 'Add new file' = hidden_field_tag 'content', '', id: 'file-content' From 67b06e7a9b54e39b2f104079dfb293645d8352c7 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 29 Sep 2014 23:58:01 +0200 Subject: [PATCH 6/7] Change always passing visible true tests to false. --- features/project/commits/comments.feature | 5 ----- features/project/commits/diff_comments.feature | 6 ------ features/steps/shared/diff_note.rb | 4 ++-- features/steps/shared/note.rb | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/features/project/commits/comments.feature b/features/project/commits/comments.feature index a45245917e..afcf0fdbb0 100644 --- a/features/project/commits/comments.feature +++ b/features/project/commits/comments.feature @@ -13,11 +13,6 @@ Feature: Project Commits Comments Scenario: I can't cancel the main form Then I should not see the cancel comment button - @javascript - Scenario: I can't preview without text - Given I haven't written any comment text - Then The comment preview tab should say there is nothing to do - @javascript Scenario: I can preview with text Given I write a comment like ":+1: Nice" diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature index 9c4cc723d1..56b9a13678 100644 --- a/features/project/commits/diff_comments.feature +++ b/features/project/commits/diff_comments.feature @@ -54,12 +54,6 @@ Feature: Project Commits Diff Comments Given I leave a diff comment like "Typo, please fix" Then I should see a discussion reply button - @javascript - Scenario: I can't preview without text - Given I open a diff comment form - And I haven't written any diff comment text - Then The diff comment preview tab should say there is nothing to do - @javascript Scenario: I can preview with text Given I open a diff comment form diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb index 28964d54a8..510e0f0f93 100644 --- a/features/steps/shared/diff_note.rb +++ b/features/steps/shared/diff_note.rb @@ -80,7 +80,7 @@ module SharedDiffNote step 'I should not see the diff comment text field' do within(diff_file_selector) do - page.should have_css(".js-note-text", visible: false) + expect(find('.js-note-text')).not_to be_visible end end @@ -115,7 +115,7 @@ module SharedDiffNote end step 'I should see add a diff comment button' do - page.should have_css(".js-add-diff-note-button", visible: false) + page.should have_css('.js-add-diff-note-button', visible: true) end step 'I should see an empty diff comment form' do diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb index 17adec3eda..625bcc0b26 100644 --- a/features/steps/shared/note.rb +++ b/features/steps/shared/note.rb @@ -64,7 +64,7 @@ module SharedNote step 'I should not see the comment text field' do within(".js-main-target-form") do - page.should have_css(".js-note-text", visible: false) + expect(find('.js-note-text')).not_to be_visible end end From 63924efeaffbf2a359817ea5f26a4c6cf0dbfb30 Mon Sep 17 00:00:00 2001 From: Sheigutn Date: Tue, 13 Jan 2015 21:04:04 +0100 Subject: [PATCH 7/7] Add support for colored header on Android Lollipop with Chrome --- app/views/layouts/_head.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index fa6aecb666..17bcf8d363 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -19,6 +19,7 @@ = csrf_meta_tags = include_gon %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'} + %meta{name: 'theme-color', content: '#474D57'} = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')