Commit e72900d8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents d0f3e993 c04e9733
...@@ -8,6 +8,8 @@ GitLab is a popular open source project and the capacity to deal with issues and ...@@ -8,6 +8,8 @@ GitLab is a popular open source project and the capacity to deal with issues and
Please treat our volunteers with courtesy and respect, it will go a long way towards getting your issue resolved. Please treat our volunteers with courtesy and respect, it will go a long way towards getting your issue resolved.
Issues and pull requests should be in English and contain appropriate language for audiences of all ages.
## Issue tracker ## Issue tracker
To get support for your particular problem please use the channels as detailed in [the getting help section of the readme](https://github.com/gitlabhq/gitlabhq#getting-help). Professional [support subscriptions](http://www.gitlab.com/subscription/) and [consulting services](http://www.gitlab.com/consultancy/) are available from [GitLab.com](http://www.gitlab.com/). To get support for your particular problem please use the channels as detailed in [the getting help section of the readme](https://github.com/gitlabhq/gitlabhq#getting-help). Professional [support subscriptions](http://www.gitlab.com/subscription/) and [consulting services](http://www.gitlab.com/consultancy/) are available from [GitLab.com](http://www.gitlab.com/).
...@@ -26,7 +28,7 @@ Please send a pull request with a tested solution or a pull request with a faili ...@@ -26,7 +28,7 @@ Please send a pull request with a tested solution or a pull request with a faili
2. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) (start with: `vagrant destroy && vagrant up && vagrant ssh`) 2. **Steps to reproduce:** How can we reproduce the issue, preferably on the [GitLab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) (start with: `vagrant destroy && vagrant up && vagrant ssh`)
3. **Expected behavior:** Describe your issue in detail 3. **Expected behavior:** Describe your issue in detail
4. **Observed behavior** 4. **Observed behavior**
5. **Relevant logs and/or screen shots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise. 5. **Relevant logs and/or screenshots:** Please use code blocks (\`\`\`) to format console output, logs, and code as it's very hard to read otherwise.
6. **Output of checks** 6. **Output of checks**
* Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (`sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production`); we will only investigate if the tests are passing * Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (`sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production`); we will only investigate if the tests are passing
* Version of GitLab you are running; we will only investigate issues in the latest stable and development releases as per the [maintenance policy](MAINTENANCE.md) * Version of GitLab you are running; we will only investigate issues in the latest stable and development releases as per the [maintenance policy](MAINTENANCE.md)
...@@ -45,6 +47,7 @@ If you can, please submit a pull request with the fix or improvements including ...@@ -45,6 +47,7 @@ If you can, please submit a pull request with the fix or improvements including
1. Fork the project on GitHub 1. Fork the project on GitHub
1. Create a feature branch 1. Create a feature branch
1. Write [tests](README.md#run-the-tests) and code 1. Write [tests](README.md#run-the-tests) and code
1. Add your changes to the [CHANGELOG](CHANGELOG)
1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
1. Push the commit to your fork 1. Push the commit to your fork
1. Submit a pull request 1. Submit a pull request
...@@ -54,12 +57,13 @@ We will accept pull requests if: ...@@ -54,12 +57,13 @@ We will accept pull requests if:
* The code has proper tests and all tests pass (or it is a test exposing a failure in existing code) * The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
* It can be merged without problems (if not please use: `git rebase master`) * It can be merged without problems (if not please use: `git rebase master`)
* It doesn't break any existing functionality * It does not break any existing functionality
* It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices * It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
* The description includes a motive for your change and the method you used to achieve it * The description includes a motive for your change and the method you used to achieve it
* It is not a catch all pull request but rather fixes a specific issue or implements a specific feature
* It keeps the GitLab code base clean and well structured * It keeps the GitLab code base clean and well structured
* We think other users will benefit from the same functionality * We think other users will benefit from the same functionality
* If it makes changes to the UI the pull request should include screenshots * If it makes changes to the UI the pull request should include screenshots
* It is a single commit (please use git rebase -i to squash commits) * It is a single commit (please use `git rebase -i` to squash commits)
For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed). For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
...@@ -4,20 +4,23 @@ ...@@ -4,20 +4,23 @@
"created_at": "2012-07-21T07:30:54Z", "created_at": "2012-07-21T07:30:54Z",
"event_name": "project_create", "event_name": "project_create",
"name": "StoreCloud", "name": "StoreCloud",
"owner_email": "johnsmith@gmail.com", "owner_email": "johnsmith@gmail.com"
"owner_name": "John Smith", "owner_name": "John Smit",
"path": "storecloud", "path": "stormcloud",
"project_id": 74 "path_with_namespace": "jsmith/stormcloud",
"project_id": 74,
} }
2. Project destroyed: 2. Project destroyed:
{ {
"created_at": "2012-07-21T07:30:58Z",
"event_name": "project_destroy", "event_name": "project_destroy",
"name": "Underscore", "name": "Underscore",
"owner_email": "johnsmith@gmail.com", "owner_email": "johnsmith@gmail.com"
"owner_name": "John Smith", "owner_name": "John Smith",
"path": "underscore", "path": "underscore",
"project_id": 73 "path_with_namespace": "jsmith/underscore",
"project_id": 73,
} }
3. New Team Member: 3. New Team Member:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
%legend Social Accounts %legend Social Accounts
.oauth_select_holder .oauth_select_holder
%p.hint Tip: Click on icon to activate sigin with one of the following services %p.hint Tip: Click on icon to activate signin with one of the following services
- enabled_social_providers.each do |provider| - enabled_social_providers.each do |provider|
%span{class: oauth_active_class(provider) } %span{class: oauth_active_class(provider) }
= link_to authbutton(provider, 32), omniauth_authorize_path(User, provider) = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
......
...@@ -81,3 +81,8 @@ When listing resources you can pass the following parameters: ...@@ -81,3 +81,8 @@ When listing resources you can pass the following parameters:
+ [System Hooks](system_hooks.md) + [System Hooks](system_hooks.md)
+ [Groups](groups.md) + [Groups](groups.md)
+ [User Teams](user_teams.md) + [User Teams](user_teams.md)
## Clients
+ [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api) - PHP
+ [Ruby Wrapper](https://github.com/NARKOZ/gitlab) - Ruby
...@@ -173,9 +173,6 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, ...@@ -173,9 +173,6 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version,
# Create directory for satellites # Create directory for satellites
sudo -u git -H mkdir /home/git/gitlab-satellites sudo -u git -H mkdir /home/git/gitlab-satellites
# Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml
# Create directories for sockets/pids and make sure GitLab can write to them # Create directories for sockets/pids and make sure GitLab can write to them
sudo -u git -H mkdir tmp/pids/ sudo -u git -H mkdir tmp/pids/
sudo -u git -H mkdir tmp/sockets/ sudo -u git -H mkdir tmp/sockets/
...@@ -219,6 +216,9 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup. ...@@ -219,6 +216,9 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup.
# 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 vim config/database.yml
# Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml
## Install Gems ## Install Gems
cd /home/git/gitlab cd /home/git/gitlab
......
...@@ -3,7 +3,7 @@ module Gitlab ...@@ -3,7 +3,7 @@ module Gitlab
extend self extend self
def path def path
%w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets ) %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets services)
end end
end end
end end
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