Automatic merge of gitlab-org/gitlab-ce master

app/models/ci/pipeline_schedule.rb

@@ -73,7 +73,8 @@ module Ci
     private
 
     def ideal_next_run_at
-      Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
+      Gitlab::Ci::CronParser.new(cron, cron_timezone)
+        .next_time_from(Time.zone.now)
     end
   end
 end

doc/administration/monitoring/performance/index.md

@@ -14,7 +14,7 @@ documents in order to understand and properly configure GitLab Performance Monit
 - [Performance bar](performance_bar.md)
 - [Request profiling](request_profiling.md)
 
->**Note:**
+NOTE: **Note:**
 Omnibus GitLab 8.16 includes Prometheus as an additional tool to collect
 metrics. It will eventually replace InfluxDB when their metrics collection is
 on par. Read more in the [Prometheus documentation](../prometheus/index.md).

doc/user/markdown.md

@@ -246,7 +246,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#inline-
 
 With inline diffs tags you can display {+ additions +} or [- deletions -].
 
-The wrapping tags can be either curly braces or square brackets: [+ additions +] or {- deletions -}.
+The wrapping tags can be either curly braces or square brackets.
 
 Examples:
 
@@ -257,6 +257,10 @@ Examples:
 - [- deletions -]
 ```
 
+becomes:
+
+![inline diffs tags rendered](img/markdown_inline_diffs_tags_rendered.png)
+
 However the wrapping tags cannot be mixed as such:
 
 ```