Merge branch 'ce-to-ee-2018-02-20' into 'master'

CE upstream - 2018-02-20 15:23 UTC

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

doc/ci/examples/README.md

@@ -23,7 +23,7 @@ There's also a collection of repositories with [example projects](https://gitlab
 - **Scala**: [Test a Scala application](test-scala-application.md)
 - **Clojure**: [Test a Clojure application](test-clojure-application.md)
 - **Elixir**:
-  - [Test a Phoenix application](test-phoenix-application.md)
+  - [Testing a Phoenix application with GitLab CI/CD](test_phoenix_app_with_gitlab_ci_cd/index.md)
   - [Building an Elixir Release into a Docker image using GitLab CI](https://about.gitlab.com/2016/08/11/building-an-elixir-release-into-docker-image-using-gitlab-ci-part-1/)
 - **iOS and macOS**:
   - [Setting up GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/)

doc/ci/examples/test-phoenix-application.md

-# Test a Phoenix application with GitLab CI/CD
+---
+redirect_to: '../../ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md'
+---
 
-This example demonstrates the integration of Gitlab CI with Phoenix, Elixir and
-Postgres.
-
-## Add `.gitlab-ci.yml` to project
-
-The following `.gitlab-ci.yml` should be added in the root of your
-repository to trigger CI:
-
-```yaml
-image: elixir:1.3
-
-services:
-  - postgres:9.6
-
-variables:
-  MIX_ENV: "test"
-
-before_script:
-  # Setup phoenix dependencies
-  - apt-get update
-  - apt-get install -y postgresql-client
-  - mix local.hex --force
-  - mix deps.get --only test
-  - mix ecto.reset
-
-test:
-  script:
-    - mix test
-```
-
-The variables will set the Mix environment to "test". The
-`before_script` will install `psql`, some Phoenix dependencies, and will also
-run your migrations.
-
-Finally, the test `script` will run your tests.
-
-## Update the Config Settings
-
-In `config/test.exs`, update the database hostname:
-
-```elixir
-config :my_app, MyApp.Repo,
-  hostname: if(System.get_env("CI"), do: "postgres", else: "localhost"),
-```
-
-## Add the Migrations Folder
-
-If you do not have any migrations yet, you will need to create an empty
-`.gitkeep` file in `priv/repo/migrations`.
-
-## Sources
-
-- https://medium.com/@nahtnam/using-phoenix-on-gitlab-ci-5a51eec81142
+The content of this page was incorporated in [this document](../../ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md).

doc/development/writing_documentation.md

@@ -257,10 +257,10 @@ through the process of how to use it systematically.
 Every **Technical Article** contains a frontmatter at the beginning of the doc
 with the following information:
 
-- **Type of article** (user guide, admin guide, tech overview, tutorial)
+- **Type of article** (user guide, admin guide, technical overview, tutorial)
 - **Knowledge level** expected from the reader to be able to follow through (beginner, intermediate, advanced)
 - **Author's name** and **GitLab.com handle**
-- **Publication date**
+- **Publication date** (ISO format YYYY-MM-DD)
 
 For example:
 

lib/gitlab/metrics/transaction.rb

@@ -73,7 +73,7 @@ module Gitlab
       # event_name - The name of the event (e.g. "git_push").
       # tags - A set of tags to attach to the event.
       def add_event(event_name, tags = {})
-        self.class.transaction_metric(event_name, :counter, prefix: 'event_', tags: tags).increment(tags.merge(labels))
+        self.class.transaction_metric(event_name, :counter, prefix: 'event_', use_feature_flag: true, tags: tags).increment(tags.merge(labels))
         @metrics << Metric.new(EVENT_SERIES, { count: 1 }, tags.merge(event: event_name), :event)
       end
 
@@ -159,11 +159,12 @@ module Gitlab
         with_feature :prometheus_metrics_transaction_allocated_memory
       end
 
-      def self.transaction_metric(name, type, prefix: nil, tags: {})
+      def self.transaction_metric(name, type, prefix: nil, use_feature_flag: false, tags: {})
         metric_name = "gitlab_transaction_#{prefix}#{name}_total".to_sym
         fetch_metric(type, metric_name) do
           docstring "Transaction #{prefix}#{name} #{type}"
           base_labels tags.merge(BASE_LABELS)
+          with_feature "prometheus_transaction_#{prefix}#{name}_total".to_sym if use_feature_flag
 
           if type == :gauge
             multiprocess_mode :livesum