diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-08 18:50:33 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-08 18:50:33 +0000 |
commit | c9240d91b04fa5c7376dc2bc257da41f32468cdc (patch) | |
tree | 4ab5d041af720a33a6529d9d2aaf344e9088d6bc /CHANGELOG | |
parent | a77394a7e526b462057c0ef88e5b8b06b96e2290 (diff) | |
parent | f9cffe104489416d9a640557d87b94fd39ea4e7e (diff) | |
download | gitlab-ce-c9240d91b04fa5c7376dc2bc257da41f32468cdc.tar.gz |
Merge branch 'patch-3' into 'master'
"This file is managed by gitlab-ctl. Manual changes will be erased!"
## What does this MR do?
This merge request replaces the word "gitlab.yml" with the word "gitlab.rb" in one section of the admin area.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Configuration is no longer done in gitlab.yml, which is overwritten by gitlab-ctl.
## What are the relevant issue numbers?
None.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [X] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5600
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index f5416434ab1..5e3c1836b2c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ v 8.11.0 (unreleased) - Optimize checking if a user has read access to a list of issues !5370 - Nokogiri's various parsing methods are now instrumented - Add simple identifier to public SSH keys (muteor) + - Admin page now references docs instead of a specific file !5600 (AnAverageHuman) - Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363 - Fix filter input alignment (ClemMakesApps) - Include old revision in merge request update hooks (Ben Boeckel) |