From 0cdef83dc8cfb96c17718d6dd1a2438dc9cea24f Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Fri, 26 Sep 2014 16:52:36 +0200 Subject: [PATCH 1/3] Remove type submit from button_tag since default. --- app/views/admin/users/index.html.haml | 2 +- app/views/projects/network/show.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index b8a1822444..f2fa5ea91c 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -22,7 +22,7 @@ = form_tag admin_users_path, method: :get, class: 'form-inline' do .form-group = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' - = button_tag type: 'submit', class: 'btn btn-primary' do + = button_tag class: 'btn btn-primary' do %i.icon-search %hr = link_to 'Reset', admin_users_path, class: "btn btn-cancel" diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index f8206936e6..52a66f64d9 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -3,7 +3,7 @@ .controls = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f| = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha' - = button_tag type: 'submit', class: 'btn btn-success btn-search-sha' do + = button_tag class: 'btn btn-success btn-search-sha' do %i.icon-search .inline.prepend-left-20 .checkbox.light From 862315dcb0b2cc5c8d78a8633a942a7921b94039 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sat, 27 Sep 2014 10:34:51 +0200 Subject: [PATCH 2/3] Typo indiciated -> indicated. --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 4fffe6c348..c39a83dea1 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -343,7 +343,7 @@ Validate your `gitlab` or `gitlab-ssl` Nginx config file with the following comm sudo nginx -t -You should receive `syntax is okay` and `test is successful` messages. If you receive errors check your `gitlab` or `gitlab-ssl` Nginx config file for typos, etc. as indiciated in the error message given. +You should receive `syntax is okay` and `test is successful` messages. If you receive errors check your `gitlab` or `gitlab-ssl` Nginx config file for typos, etc. as indicated in the error message given. ### Restart From ac55373ff39674782e914b045469ae49c77e814a Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sat, 27 Sep 2014 11:15:08 +0200 Subject: [PATCH 3/3] Replace empty? || nil? with blank?. --- db/fixtures/production/001_admin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 21c10f3192..f84d090391 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -1,4 +1,4 @@ -password = if ENV['GITLAB_ROOT_PASSWORD'].nil? || ENV['GITLAB_ROOT_PASSWORD'].empty? +password = if ENV['GITLAB_ROOT_PASSWORD'].blank? "5iveL!fe" else ENV['GITLAB_ROOT_PASSWORD']