Commit 477214cd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents e7a3b2c7 c2c41fb2
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= form_tag admin_users_path, method: :get, class: 'form-inline' do = form_tag admin_users_path, method: :get, class: 'form-inline' do
.form-group .form-group
= search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' = 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 %i.icon-search
%hr %hr
= link_to 'Reset', admin_users_path, class: "btn btn-cancel" = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.controls .controls
= form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f| = 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' = 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 %i.icon-search
.inline.prepend-left-20 .inline.prepend-left-20
.checkbox.light .checkbox.light
......
password = if ENV['GITLAB_ROOT_PASSWORD'].nil? || ENV['GITLAB_ROOT_PASSWORD'].empty? password = if ENV['GITLAB_ROOT_PASSWORD'].blank?
"5iveL!fe" "5iveL!fe"
else else
ENV['GITLAB_ROOT_PASSWORD'] ENV['GITLAB_ROOT_PASSWORD']
......
...@@ -343,7 +343,7 @@ Validate your `gitlab` or `gitlab-ssl` Nginx config file with the following comm ...@@ -343,7 +343,7 @@ Validate your `gitlab` or `gitlab-ssl` Nginx config file with the following comm
sudo nginx -t 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 ### Restart
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment