Merge branch 'ce-to-ee-2018-10-18' into 'master'

CE upstream - 2018-10-18 20:49 UTC

Closes gitlab-ce#52654

See merge request gitlab-org/gitlab-ee!8005

README.md

@@ -113,7 +113,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the
 GitLab is a Ruby on Rails application that runs on the following software:
 
 - Ubuntu/Debian/CentOS/RHEL/OpenSUSE
-- Ruby (MRI) 2.3
+- Ruby (MRI) 2.4
 - Git 2.8.4+
 - Redis 2.8+
 - PostgreSQL (preferred) or MySQL

app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js

@@ -549,6 +549,7 @@ const fileNameIcons = {
   jenkinsfile: 'jenkins',
   'firebase.json': 'firebase',
   '.firebaserc': 'firebase',
+  Rakefile: 'ruby',
   'rollup.config.js': 'rollup',
   'rollup.config.ts': 'rollup',
   'rollup-config.js': 'rollup',

app/services/web_hook_service.rb

@@ -22,7 +22,7 @@ class WebHookService
   end
 
   def execute
-    start_time = Time.now
+    start_time = Gitlab::Metrics::System.monotonic_time
 
     response = if parsed_url.userinfo.blank?
                  make_request(hook.url)
@@ -35,7 +35,7 @@ class WebHookService
       url: hook.url,
       request_data: data,
       response: response,
-      execution_duration: Time.now - start_time
+      execution_duration: Gitlab::Metrics::System.monotonic_time - start_time
     )
 
     {
@@ -49,7 +49,7 @@ class WebHookService
       url: hook.url,
       request_data: data,
       response: InternalErrorResponse.new,
-      execution_duration: Time.now - start_time,
+      execution_duration: Gitlab::Metrics::System.monotonic_time - start_time,
       error_message: e.to_s
     )
 

changelogs/unreleased/43422-Update-images-in-group-docs.yml

+---
+title: Update images in group docs
+merge_request: 22031
+author: Marc Schwede
+type: other

changelogs/unreleased/sh-associate-rakefile-ruby.yml

+---
+title: Associate Rakefile with Ruby icon in diffs
+merge_request:
+author:
+type: other

changelogs/unreleased/update-readme-ruby-version.yml

+---
+title: Update Ruby version in README
+merge_request: 22466
+author: J.D. Bean
+type: changed

doc/administration/repository_checks.md

@@ -31,7 +31,7 @@ panel.
 If the repository check fails for some repository you should look up the error
 in `repocheck.log`:
 
-- in the [admin panel](logs.md#repocheck.log)
+- in the [admin panel](logs.md#repocheck-log)
 - or on disk, see:
     - `/var/log/gitlab/gitlab-rails` for Omnibus installations
     - `/home/git/gitlab/log` for installations from source

doc/administration/repository_storage_types.md

@@ -41,11 +41,8 @@ Registry, etc.
 
 ## Hashed Storage
 
-> **Warning:** Hashed storage is in **Beta**. For the latest updates, check the
-> associated [issue](https://gitlab.com/gitlab-com/infrastructure/issues/3542)
-> and please report any problems you encounter.
 
-Hashed Storage is the new storage behavior we are rolling out with 10.0. Instead
+Hashed Storage is the new storage behavior we rolled out with 10.0. Instead
 of coupling project URL and the folder structure where the repository will be
 stored on disk, we are coupling a hash, based on the project's ID. This makes
 the folder structure immutable, and therefore eliminates any requirement to

doc/api/notes.md

@@ -98,7 +98,7 @@ POST /projects/:id/issues/:issue_iid/notes
 Parameters:
 
 - `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding)
-- `issue_id` (required) - The IID of an issue
+- `issue_iid` (required) - The IID of an issue
 - `body` (required) - The content of a note
 - `created_at` (optional) - Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z (requires admin or project/group owner rights)
 

doc/ci/yaml/README.md

@@ -681,7 +681,7 @@ Delayed job are for executing scripts after a certain period.
 This is useful if you want to avoid jobs entering `pending` state immediately.
 
 You can set the period with `start_in` key. The value of `start_in` key is an elapsed time in seconds, unless a unit is
-provided. `start_key` must be less than or equal to one hour. Examples of valid values include:
+provided. `start_in` key must be less than or equal to one hour. Examples of valid values include:
 
 - `10 seconds`
 - `30 minutes`