Commit 4ea7b192d4de3b670829b817914f26c943cc286c
1 parent
9220e3ef
Exists in
spb-stable
and in
2 other branches
Use same size headers. Add PullReview. Mention shell guide as created by us.
Showing
2 changed files
with
4 additions
and
5 deletions
Show diff stats
CONTRIBUTING.md
| @@ -110,8 +110,7 @@ For examples of feedback on merge requests please look at already [closed merge | @@ -110,8 +110,7 @@ For examples of feedback on merge requests please look at already [closed merge | ||
| 110 | 1. [Rails](https://github.com/bbatsov/rails-style-guide) | 110 | 1. [Rails](https://github.com/bbatsov/rails-style-guide) |
| 111 | 1. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing) | 111 | 1. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing) |
| 112 | 1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript) | 112 | 1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript) |
| 113 | -1. [Shell commands](doc/development/shell_commands.md) | 113 | +1. [Shell commands](doc/development/shell_commands.md) created by GitLab contributors to enhance security |
| 114 | 1. [Markdown](http://www.cirosantilli.com/markdown-styleguide) | 114 | 1. [Markdown](http://www.cirosantilli.com/markdown-styleguide) |
| 115 | 115 | ||
| 116 | -This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop) | ||
| 117 | -and [Hound CI](https://houndci.com). | 116 | +This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop), PullReview[https://www.pullreview.com/] and [Hound CI](https://houndci.com). |
README.md
| @@ -83,13 +83,13 @@ or by directly calling the script: | @@ -83,13 +83,13 @@ or by directly calling the script: | ||
| 83 | 83 | ||
| 84 | Please login with `root` / `5iveL!fe`. | 84 | Please login with `root` / `5iveL!fe`. |
| 85 | 85 | ||
| 86 | -### Install a development environment | 86 | +## Install a development environment |
| 87 | 87 | ||
| 88 | We recommend setting up your development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). If you do not use the cookbook you might need to copy the example development unicorn configuration file | 88 | We recommend setting up your development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). If you do not use the cookbook you might need to copy the example development unicorn configuration file |
| 89 | 89 | ||
| 90 | cp config/unicorn.rb.example.development config/unicorn.rb | 90 | cp config/unicorn.rb.example.development config/unicorn.rb |
| 91 | 91 | ||
| 92 | -### Run in development mode | 92 | +## Run in development mode |
| 93 | 93 | ||
| 94 | Start it with [Foreman](https://github.com/ddollar/foreman) | 94 | Start it with [Foreman](https://github.com/ddollar/foreman) |
| 95 | 95 |