From 015d8da7319e8e58869d56c8f516c275035a6c56 Mon Sep 17 00:00:00 2001 From: GitLab Date: Mon, 1 Jul 2013 21:14:39 -0500 Subject: [PATCH 1/6] Updating documentation to reflect #3836 (resolving #4443) --- app/views/admin/hooks/_data_ex.html.erb | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/views/admin/hooks/_data_ex.html.erb b/app/views/admin/hooks/_data_ex.html.erb index eeb78b5f0c5..b69aa92716d 100644 --- a/app/views/admin/hooks/_data_ex.html.erb +++ b/app/views/admin/hooks/_data_ex.html.erb @@ -1,23 +1,26 @@ <% data_ex_str = < Date: Wed, 3 Jul 2013 15:15:50 +1000 Subject: [PATCH 2/6] move 'make config/database.yml readable to git only' instruction I've moved the instruction in question to the the 'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist :wink: --- doc/install/installation.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 47faab407e3..146f45f7cd6 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -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 -- GitLab From 702dc30448b6f1c5f4f3e45a9b170c2bcc0a2f15 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Wed, 3 Jul 2013 12:57:35 +0200 Subject: [PATCH 3/6] Add 'services' to path blacklist, fixes #4470 --- lib/gitlab/blacklist.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/blacklist.rb b/lib/gitlab/blacklist.rb index b678a83fabf..59203b2fbd6 100644 --- a/lib/gitlab/blacklist.rb +++ b/lib/gitlab/blacklist.rb @@ -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 -- GitLab From b8f51acf7bf72fb832be7aefe8d7009f2a23a0f0 Mon Sep 17 00:00:00 2001 From: dekimsey Date: Wed, 3 Jul 2013 13:34:23 -0400 Subject: [PATCH 4/6] Fix misspelling in social accounts tip --- app/views/profiles/account.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 09d9ec10e81..9b1354d9f2c 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -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) -- GitLab From 4bba945437f67ffa5fb6a4afad60729c1827e26b Mon Sep 17 00:00:00 2001 From: Matt Humphrey Date: Sat, 6 Jul 2013 10:14:06 +0100 Subject: [PATCH 5/6] Added client list to API doc --- doc/api/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/api/README.md b/doc/api/README.md index 6faf6dcc7c2..4bcd89949df 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -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 -- GitLab From b686b4b9623f277c35d0972ada4d8f8803cb7c97 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sun, 7 Jul 2013 04:46:37 -0700 Subject: [PATCH 6/6] minor contributing guide updates * issues & pr in English * appropriate language * typo & format fix * not catch all pull request * update changelog --- CONTRIBUTING.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95fa25823ba..761cfe3e261 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 (\`\`\`) 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** * 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). -- GitLab