diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:45 +0300 |
| commit | 55693cc1ec8ac79444bc7214d2812a4ac41bf043 (patch) | |
| tree | c9e9df7be9eac5dd1ea71f65da9a6831834b08c4 /doc | |
| parent | c089cf73c2f1835dc68fd6107d6cbd10fc17f365 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/contributing/style_guides.md | 4 | ||||
| -rw-r--r-- | doc/development/go_guide/index.md | 6 | ||||
| -rw-r--r-- | doc/fixtures/gitlab_tanuki.png | bin | 2545 -> 0 bytes | |||
| -rw-r--r-- | doc/user/markdown.md | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/doc/development/contributing/style_guides.md b/doc/development/contributing/style_guides.md index f35757249fc..24c8de80e51 100644 --- a/doc/development/contributing/style_guides.md +++ b/doc/development/contributing/style_guides.md @@ -4,7 +4,9 @@ You're strongly advised to install [Overcommit](https://github.com/sds/overcommit) to automatically check for -static analysis offenses before committing locally: +static analysis offenses before committing locally. + +In your GitLab source directory run: ```shell cd tooling/overcommit && make && cd - diff --git a/doc/development/go_guide/index.md b/doc/development/go_guide/index.md index 59efc7be2f4..d9641bcfbab 100644 --- a/doc/development/go_guide/index.md +++ b/doc/development/go_guide/index.md @@ -52,9 +52,9 @@ Web servers can take advantages of middlewares like [Secure](https://github.com/ Many of our projects are too small to have full-time maintainers. That's why we have a shared pool of Go reviewers at GitLab. To find a reviewer, use the -[Engineering Projects](https://about.gitlab.com/handbook/engineering/projects/) -page in the handbook. "GitLab Community Edition (CE)" and "GitLab Community -Edition (EE)" both have a "Go" section with its list of reviewers. +["Go" section](https://about.gitlab.com/handbook/engineering/projects/#gitlab_reviewers_go) +of the "GitLab" project on the Engineering Projects +page in the handbook. To add yourself to this list, add the following to your profile in the [team.yml](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/team.yml) diff --git a/doc/fixtures/gitlab_tanuki.png b/doc/fixtures/gitlab_tanuki.png Binary files differdeleted file mode 100644 index 551dd6ce2ce..00000000000 --- a/doc/fixtures/gitlab_tanuki.png +++ /dev/null diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 5bfbc6c1ec8..c83fb3260c8 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -896,6 +896,11 @@ Reference-style (hover to see title text): [logo]: img/markdown_logo.png "Title Text" ``` +<!-- +DO NOT change the name of markdown_logo.png. This is used for a test +in spec/controllers/help_controller_spec.rb. +--> + Inline-style (hover to see title text):  |
