Commit d2d566b1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 8dd6af14 a8b544ed
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.input .input
= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
%h6 Choose greatest user acces for your team in this projects: %h6 Choose greatest user access for your team in these projects:
.clearfix .clearfix
= label_tag :greatest_project_access, "Greatest Access" = label_tag :greatest_project_access, "Greatest Access"
.input .input
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.padded .padded
= label_tag :team_id, "Team" = label_tag :team_id, "Team"
.input= select_tag(:team_id, options_from_collection_for_select(@teams, :id, :name), prompt: "Select team", class: "chosen xxlarge", required: true) .input= select_tag(:team_id, options_from_collection_for_select(@teams, :id, :name), prompt: "Select team", class: "chosen xxlarge", required: true)
%p.slead Choose greatest user acces in team you want to assign: %p.slead Choose greatest user access for your team in this project:
.padded .padded
= label_tag :team_ids, "Permission" = label_tag :team_ids, "Permission"
.input= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" } .input= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" }
......
...@@ -42,11 +42,13 @@ up-to-date and install it. ...@@ -42,11 +42,13 @@ up-to-date and install it.
apt-get install sudo -y apt-get install sudo -y
**Note:** **Note:**
Vim is an editor that is used here whenever there are files that need to be During this installation some files will need to be edited manually.
edited by hand. But, you can use any editor you like instead. If you are familiar with vim set it as default editor with the commands below.
If you are not familiar with vim please skip this and keep using the default editor.
# Install vim # Install vim and set as default editor
sudo apt-get install -y vim sudo apt-get install -y vim
sudo update-alternatives --set editor /usr/bin/vim.basic
Install the required packages: Install the required packages:
...@@ -123,7 +125,7 @@ GitLab Shell is a ssh access and repository management software developed specia ...@@ -123,7 +125,7 @@ GitLab Shell is a ssh access and repository management software developed specia
# Edit config and replace gitlab_url # Edit config and replace gitlab_url
# with something like 'http://domain.com/' # with something like 'http://domain.com/'
sudo -u git -H vim config.yml sudo -u git -H editor config.yml
# Do setup # Do setup
sudo -u git -H ./bin/install sudo -u git -H ./bin/install
...@@ -162,7 +164,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, ...@@ -162,7 +164,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version,
# Make sure to change "localhost" to the fully-qualified domain name of your # Make sure to change "localhost" to the fully-qualified domain name of your
# host serving GitLab where necessary # host serving GitLab where necessary
sudo -u git -H vim config/gitlab.yml sudo -u git -H editor config/gitlab.yml
# Make sure GitLab can write to the log/ and tmp/ directories # Make sure GitLab can write to the log/ and tmp/ directories
sudo chown -R git log/ sudo chown -R git log/
...@@ -188,7 +190,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, ...@@ -188,7 +190,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version,
# Enable cluster mode if you expect to have a high load instance # Enable cluster mode if you expect to have a high load instance
# Ex. change amount of workers to 3 for 2GB RAM server # Ex. change amount of workers to 3 for 2GB RAM server
sudo -u git -H vim config/puma.rb sudo -u git -H editor config/puma.rb
# Configure Git global settings for git user, useful when editing via web # Configure Git global settings for git user, useful when editing via web
# Edit user.email according to what is set in gitlab.yml # Edit user.email according to what is set in gitlab.yml
...@@ -214,7 +216,7 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup. ...@@ -214,7 +216,7 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup.
# Change 'root' to 'gitlab' # Change 'root' to 'gitlab'
# Change 'secure password' with the value you have given to $password # Change 'secure password' with the value you have given to $password
# You can keep the double quotes around the password # You can keep the double quotes around the password
sudo -u git -H vim config/database.yml sudo -u git -H editor config/database.yml
# Make config/database.yml readable to git only # Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml sudo -u git -H chmod o-rwx config/database.yml
...@@ -295,7 +297,7 @@ Make sure to edit the config file to match your setup: ...@@ -295,7 +297,7 @@ Make sure to edit the config file to match your setup:
# Change YOUR_SERVER_FQDN to the fully-qualified # Change YOUR_SERVER_FQDN to the fully-qualified
# domain name of your host serving GitLab. # domain name of your host serving GitLab.
sudo vim /etc/nginx/sites-available/gitlab sudo editor /etc/nginx/sites-available/gitlab
## 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