Automatic merge of gitlab-org/gitlab-ce master

doc/development/profiling.md

@@ -72,6 +72,16 @@ Gitlab::Profiler.print_by_total_time(result, max_percent: 60, min_percent: 2)
 #   0.02      0.865     0.000     0.000     0.864      638  *Enumerable#inject
 ```
 
+To print the profile in HTML format, use the following example:
+
+
+```ruby
+result = Gitlab::Profiler.profile('/my-user')
+
+printer = RubyProf::CallStackPrinter.new(result)
+printer.print(File.open('/tmp/profile.html', 'w'))
+```
+
 [GitLab-Profiler](https://gitlab.com/gitlab-com/gitlab-profiler) is a project
 that builds on this to add some additional niceties, such as allowing
 configuration with a single Yaml file for multiple URLs, and uploading of the

doc/user/project/pages/introduction.md

@@ -348,8 +348,8 @@ This can be achieved by including a `script:` command like this in your
 pages:
   # Other directives
   script:
-    - # build the public/ directory first
-    - find public -type f -iregex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -execdir gzip -f --keep {} \;
+    # Build the public/ directory first
+    - find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \;
 ```
 
 By pre-compressing the files and including both versions in the artifact, Pages