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

Dmitriy Zaporozhets
2 parents d0f3e993 c04e9733
Showing 6 changed files with 33 additions and 21 deletions Show diff stats
CONTRIBUTING.md
app/views/admin/hooks/_data_ex.html.erb
app/views/profiles/account.html.haml
doc/api/README.md
doc/install/installation.md
lib/gitlab/blacklist.rb
@@ -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.
  
+Issues and pull requests should be in English and contain appropriate language for audiences of all ages.
+
 ## 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/).
@@ -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`)
 3. **Expected behavior:** Describe your issue in detail
 4. **Observed behavior**
-5. **Relevant logs and/or screen shots:** Please use code blocks (-5. **Relevant logs and/or screen -5. **Relevant logs and/or screen -5. **Relevant logs and/or screen ) 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 (+5. **Relevant logs and/or screen+5. **Relevant logs and/or screen+5. **Relevant logs and/or screen) to format console output, logs, and code as it's very hard to read otherwise.
 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
     * 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 
 1. Fork the project on GitHub
 1. Create a feature branch
 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. Push the commit to your fork
 1. Submit a pull request
@@ -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)
 * 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
 * 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
 * We think other users will benefit from the same functionality
 * 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).
 <% data_ex_str = <<eos
 1. Project created:
 {
-   "created_at": "2012-07-21T07:30:54Z",
-   "event_name": "project_create",
-         "name": "StoreCloud",
-  "owner_email": "johnsmith@gmail.com",
-   "owner_name": "John Smith",
-         "path": "storecloud",
-   "project_id": 74 
+          "created_at": "2012-07-21T07:30:54Z",
+          "event_name": "project_create",
+                "name": "StoreCloud",
+         "owner_email": "johnsmith@gmail.com"
+          "owner_name": "John Smit",
+                "path": "stormcloud",
+ "path_with_namespace": "jsmith/stormcloud",
+          "project_id": 74,
 }
  
 2. Project destroyed:
 {
-  "event_name": "project_destroy",
-        "name": "Underscore",
- "owner_email": "johnsmith@gmail.com",
-  "owner_name": "John Smith",
-        "path": "underscore",
-  "project_id": 73 
+          "created_at": "2012-07-21T07:30:58Z",
+          "event_name": "project_destroy",
+                "name": "Underscore",
+         "owner_email": "johnsmith@gmail.com"
+          "owner_name": "John Smith",
+                "path": "underscore",
+ "path_with_namespace": "jsmith/underscore",
+          "project_id": 73,
 }
  
 3. New Team Member:
@@ -3,7 +3,7 @@
     %fieldset
       %legend Social Accounts
       .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|
           %span{class: oauth_active_class(provider) }
             = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
@@ -81,3 +81,8 @@ When listing resources you can pass the following parameters:
 + [System Hooks](system_hooks.md)
 + [Groups](groups.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,
     # Create directory for 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
     sudo -u git -H mkdir tmp/pids/
     sudo -u git -H mkdir tmp/sockets/
@@ -218,6 +215,9 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup.
     # Change 'secure password' with the value you have given to $password
     # You can keep the double quotes around the password
     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
  
@@ -3,7 +3,7 @@ module Gitlab
     extend self
  
     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
...	...	@@ -8,6 +8,8 @@ GitLab is a popular open source project and the capacity to deal with issues and
8	8
9	9	Please treat our volunteers with courtesy and respect, it will go a long way towards getting your issue resolved.
10	10
	11	+Issues and pull requests should be in English and contain appropriate language for audiences of all ages.
	12	+
11	13	## Issue tracker
12	14
13	15	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	28	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`)
27	29	3. Expected behavior: Describe your issue in detail
28	30	4. Observed behavior
29		-5. Relevant logs and/or screen shots: Please use code blocks (-5. Relevant logs and/or screen -5. Relevant logs and/or screen -5. **Relevant logs and/or screen ) to format console output, logs, and code as it's very hard to read otherwise.
	31	+5. Relevant logs and/or screenshots: Please use code blocks (+5. Relevant logs and/or screen+5. Relevant logs and/or screen+5. **Relevant logs and/or screen) to format console output, logs, and code as it's very hard to read otherwise.
30	32	6. Output of checks
31	33	* 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
32	34	* 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	47	1. Fork the project on GitHub
46	48	1. Create a feature branch
47	49	1. Write [tests](README.md#run-the-tests) and code
	50	+1. Add your changes to the [CHANGELOG](CHANGELOG)
48	51	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)
49	52	1. Push the commit to your fork
50	53	1. Submit a pull request
...	...	@@ -54,12 +57,13 @@ We will accept pull requests if:
54	57
55	58	* The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
56	59	* It can be merged without problems (if not please use: `git rebase master`)
57		-* It doesn't break any existing functionality
	60	+* It does not break any existing functionality
58	61	* 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
59	62	* The description includes a motive for your change and the method you used to achieve it
	63	+* It is not a catch all pull request but rather fixes a specific issue or implements a specific feature
60	64	* It keeps the GitLab code base clean and well structured
61	65	* We think other users will benefit from the same functionality
62	66	* If it makes changes to the UI the pull request should include screenshots
63		-* It is a single commit (please use git rebase -i to squash commits)
	67	+* It is a single commit (please use `git rebase -i` to squash commits)
64	68
65	69	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).
...	...
1	1	<% data_ex_str = <<eos
2	2	1. Project created:
3	3	{
4		- "created_at": "2012-07-21T07:30:54Z",
5		- "event_name": "project_create",
6		- "name": "StoreCloud",
7		- "owner_email": "johnsmith@gmail.com",
8		- "owner_name": "John Smith",
9		- "path": "storecloud",
10		- "project_id": 74
	4	+ "created_at": "2012-07-21T07:30:54Z",
	5	+ "event_name": "project_create",
	6	+ "name": "StoreCloud",
	7	+ "owner_email": "johnsmith@gmail.com"
	8	+ "owner_name": "John Smit",
	9	+ "path": "stormcloud",
	10	+ "path_with_namespace": "jsmith/stormcloud",
	11	+ "project_id": 74,
11	12	}
12	13
13	14	2. Project destroyed:
14	15	{
15		- "event_name": "project_destroy",
16		- "name": "Underscore",
17		- "owner_email": "johnsmith@gmail.com",
18		- "owner_name": "John Smith",
19		- "path": "underscore",
20		- "project_id": 73
	16	+ "created_at": "2012-07-21T07:30:58Z",
	17	+ "event_name": "project_destroy",
	18	+ "name": "Underscore",
	19	+ "owner_email": "johnsmith@gmail.com"
	20	+ "owner_name": "John Smith",
	21	+ "path": "underscore",
	22	+ "path_with_namespace": "jsmith/underscore",
	23	+ "project_id": 73,
21	24	}
22	25
23	26	3. New Team Member:
...	...
...	...	@@ -3,7 +3,7 @@
3	3	%fieldset
4	4	%legend Social Accounts
5	5	.oauth_select_holder
6		- %p.hint Tip: Click on icon to activate sigin with one of the following services
	6	+ %p.hint Tip: Click on icon to activate signin with one of the following services
7	7	- enabled_social_providers.each do \|provider\|
8	8	%span{class: oauth_active_class(provider) }
9	9	= link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
...	...
...	...	@@ -81,3 +81,8 @@ When listing resources you can pass the following parameters:
81	81	+ [System Hooks](system_hooks.md)
82	82	+ [Groups](groups.md)
83	83	+ [User Teams](user_teams.md)
	84	+
	85	+## Clients
	86	+
	87	++ [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api) - PHP
	88	++ [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	173	# Create directory for satellites
174	174	sudo -u git -H mkdir /home/git/gitlab-satellites
175	175
176		- # Make config/database.yml readable to git only
177		- sudo -u git -H chmod o-rwx config/database.yml
178		-
179	176	# Create directories for sockets/pids and make sure GitLab can write to them
180	177	sudo -u git -H mkdir tmp/pids/
181	178	sudo -u git -H mkdir tmp/sockets/
...	...	@@ -218,6 +215,9 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup.
218	215	# Change 'secure password' with the value you have given to $password
219	216	# You can keep the double quotes around the password
220	217	sudo -u git -H vim config/database.yml
	218	+
	219	+ # Make config/database.yml readable to git only
	220	+ sudo -u git -H chmod o-rwx config/database.yml
221	221
222	222	## Install Gems
223	223
...	...
...	...	@@ -3,7 +3,7 @@ module Gitlab
3	3	extend self
4	4
5	5	def path
6		- %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets )
	6	+ %w(admin dashboard groups help profile projects search public assets u s teams merge_requests issues users snippets services)
7	7	end
8	8	end
9	9	end
...	...