Add latest changes from gitlab-org/gitlab@master

app/controllers/projects/settings/operations_controller.rb

@@ -8,6 +8,7 @@ module Projects
       helper_method :error_tracking_setting
       def show
+        render locals: { prometheus_service: prometheus_service }
       end
       def update
@@ -28,6 +29,10 @@ module Projects
       private
+      def prometheus_service
+        project.find_or_initialize_service(::PrometheusService.to_param)
+      end
+
       def render_update_response(result)
         respond_to do |format|
           format.html do

app/models/label.rb

@@ -202,10 +202,6 @@ class Label < ApplicationRecord
     priorities.present?
   end
-  def template?
-    template
-  end
-
   def color
     super || DEFAULT_COLOR
   end

app/views/help/ui.html.haml

@@ -323,8 +323,8 @@
           .dropdown-footer
             %strong Tip:
             If an author is not a member of this project, you can still filter by their name while using the search field.
-          .dropdown-loading
-            = icon('spinner spin')
+          .dropdown-loading.text-center
+            .spinner.spinner-md.mt-8
   .example
     %div
@@ -404,8 +404,8 @@
             %input.dropdown-input-field{ type: "search", placeholder: "Filter results" }
             = icon('search')
           .dropdown-content
-          .dropdown-loading
-            = icon('spinner spin')
+          .dropdown-loading.text-center
+            .spinner.spinner-md.mt-8
   .example
     %div

app/views/projects/settings/operations/_configuration_banner.html.haml

+%b
+  = s_('PrometheusService|Auto configuration')
+
+- if service.manual_configuration?
+  .info-well.p-2.mt-2
+    = s_('PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below')
+- else
+  .container-fluid
+    .row
+      - if service.prometheus_available?
+        .col-sm-2
+          .svg-container
+            = image_tag 'illustrations/monitoring/getting_started.svg'
+        .col-sm-10
+          %p.text-success.prepend-top-default
+            = s_('PrometheusService|Prometheus is being automatically managed on your clusters')
+          = link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn'
+      - else
+        .col-sm-2
+          = image_tag 'illustrations/monitoring/loading.svg'
+        .col-sm-10
+          %p.prepend-top-default
+            = s_('PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments')
+          = link_to s_('PrometheusService|Install Prometheus on clusters'), project_clusters_path(project), class: 'btn btn-success'

app/views/projects/settings/operations/_prometheus.html.haml

+%section.settings.no-animate.js-prometheus-settings
+  .settings-header
+    %h4
+      = _('Prometheus')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = _('Expand')
+    %p
+      = _('Link Prometheus monitoring to GitLab.')
+      = link_to _('More information'), help_page_path('user/project/integrations/prometheus'), target: '_blank', rel: 'noopener noreferrer'
+  .settings-content
+    - if @project
+      = render 'projects/settings/operations/configuration_banner', project: @project, service: service
+
+    %b.append-bottom-default
+      = s_('PrometheusService|Manual configuration')
+
+    - unless service.editable?
+      .info-well
+        = s_('PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters')

app/views/projects/settings/operations/show.html.haml

@@ -4,6 +4,7 @@
 = render 'projects/settings/operations/incidents'
 = render 'projects/settings/operations/error_tracking'
+= render 'projects/settings/operations/prometheus', service: prometheus_service if Feature.enabled?(:settings_operations_prometheus_service)
 = render 'projects/settings/operations/external_dashboard'
 = render 'projects/settings/operations/grafana_integration'
 = render_if_exists 'projects/settings/operations/tracing'

changelogs/unreleased/37256-use-workhorse-acceleration-on-project-import.yml

+---
+title: Enable Workhorse upload acceleration for Project Import API
+merge_request: 25361
+author:
+type: performance

changelogs/unreleased/Resolve-Migrate--fa-spinner-app-views-help.yml

+---
+title: Migrate .fa-spinner to .spinner for app/views/help
+merge_request: 25037
+author: nuwe1
+type: other

doc/api/appearance.md

@@ -9,7 +9,7 @@ Appearance API allows you to maintain GitLab's appearance as if using the GitLab
 List the current appearance configuration of the GitLab instance.
-```
+```plaintext
 GET /application/appearance
 ```
@@ -39,7 +39,7 @@ Example response:
 Use an API call to modify GitLab instance appearance configuration.
-```
+```plaintext
 PUT /application/appearance
 ```

doc/api/audit_events.md

@@ -8,7 +8,7 @@ To retrieve audit events using the API, you must [authenticate yourself](README.
 ### Retrieve all instance audit events
-```
+```plaintext
 GET /audit_events
 ```
@@ -87,7 +87,7 @@ Example response:
 ### Retrieve single instance audit event
-```
+```plaintext
 GET /audit_events/:id
 ```
@@ -126,7 +126,7 @@ To retrieve group audit events using the API, you must [authenticate yourself](R
 ### Retrieve all group audit events
-```
+```plaintext
 GET /groups/:id/audit_events
 ```
@@ -188,7 +188,7 @@ Example response:
 Only available to group owners and administrators.
-```
+```plaintext
 GET /groups/:id/audit_events/:audit_event_id
 ```

doc/api/boards.md

@@ -9,7 +9,7 @@ request on that project will result to a `404` status code.
 Lists Issue Boards in the given project.
-```
+```plaintext
 GET /projects/:id/boards
 ```
@@ -83,7 +83,7 @@ Example response:
 Get a single board.
-```
+```plaintext
 GET /projects/:id/boards/:board_id
 ```
@@ -157,7 +157,7 @@ Example response:
 Creates a board.
-```
+```plaintext
 POST /projects/:id/boards
 ```
@@ -233,7 +233,7 @@ Example response:
 Updates a board.
-```
+```plaintext
 PUT /projects/:id/boards/:board_id
 ```
@@ -312,7 +312,7 @@ Example response:
 Deletes a board.
-```
+```plaintext
 DELETE /projects/:id/boards/:board_id
 ```
@@ -330,7 +330,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" https://gitl
 Get a list of the board's lists.
 Does not include `open` and `closed` lists
-```
+```plaintext
 GET /projects/:id/boards/:board_id/lists
 ```
@@ -387,7 +387,7 @@ Example response:
 Get a single board list.
-```
+```plaintext
 GET /projects/:id/boards/:board_id/lists/:list_id
 ```
@@ -421,7 +421,7 @@ Example response:
 Creates a new Issue Board list.
-```
+```plaintext
 POST /projects/:id/boards/:board_id/lists
 ```
@@ -463,7 +463,7 @@ Example response:
 Updates an existing Issue Board list. This call is used to change list position.
-```
+```plaintext
 PUT /projects/:id/boards/:board_id/lists/:list_id
 ```
@@ -498,7 +498,7 @@ Example response:
 Only for admins and project owners. Deletes the board list in question.
-```
+```plaintext
 DELETE /projects/:id/boards/:board_id/lists/:list_id
 ```

doc/api/commits.md

@@ -4,7 +4,7 @@
 Get a list of repository commits in a project.
-```
+```plaintext
 GET /projects/:id/repository/commits
 ```
@@ -67,7 +67,7 @@ Example response:
 Create a commit by posting a JSON payload
-```
+```plaintext
 POST /projects/:id/repository/commits
 ```
@@ -190,7 +190,7 @@ curl --request POST \
 Get a specific commit identified by the commit hash or name of a branch or tag.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha
 ```
@@ -246,7 +246,7 @@ Example response:
 Get all references (from branches or tags) a commit is pushed to.
 The pagination parameters `page` and `per_page` can be used to restrict the list of references.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/refs
 ```
@@ -280,7 +280,7 @@ Example response:
 Cherry picks a commit to a given branch.
-```
+```plaintext
 POST /projects/:id/repository/commits/:sha/cherry_pick
 ```
@@ -339,7 +339,7 @@ conflict.
 Reverts a commit in a given branch.
-```
+```plaintext
 POST /projects/:id/repository/commits/:sha/revert
 ```
@@ -391,7 +391,7 @@ changeset was empty, likely due to the change having already been reverted.
 Get the diff of a commit in a project.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/diff
 ```
@@ -427,7 +427,7 @@ Example response:
 Get the comments of a commit in a project.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/comments
 ```
@@ -478,7 +478,7 @@ cases below is valid:
 In any of the above cases, the response of `line`, `line_type` and `path` is
 set to `null`.
-```
+```plaintext
 POST /projects/:id/repository/commits/:sha/comments
 ```
@@ -524,7 +524,7 @@ Since GitLab 8.1, this is the new commit status API.
 List the statuses of a commit in a project.
 The pagination parameters `page` and `per_page` can be used to restrict the list of references.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/statuses
 ```
@@ -598,7 +598,7 @@ Example response:
 Adds or updates a build status of a commit.
-```
+```plaintext
 POST /projects/:id/statuses/:sha
 ```
@@ -651,7 +651,7 @@ Example response:
 Get a list of Merge Requests related to the specified commit.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/merge_requests
 ```
@@ -720,7 +720,7 @@ Example response:
 Get the [GPG signature from a commit](../user/project/repository/gpg_signed_commits/index.md),
 if it is signed. For unsigned commits, it results in a 404 response.
-```
+```plaintext
 GET /projects/:id/repository/commits/:sha/signature
 ```

doc/api/container_registry.md

@@ -10,7 +10,7 @@ This is the API docs of the [GitLab Container Registry](../user/packages/contain
 Get a list of registry repositories in a project.
-```
+```plaintext
 GET /projects/:id/registry/repositories
 ```
@@ -50,7 +50,7 @@ Example response:
 Get a list of registry repositories in a group.
-```
+```plaintext
 GET /groups/:id/registry/repositories
 ```
@@ -116,7 +116,7 @@ Delete a repository in registry.
 This operation is executed asynchronously and might take some time to get executed.
-```
+```plaintext
 DELETE /projects/:id/registry/repositories/:repository_id
 ```
@@ -135,7 +135,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 Get a list of tags for given registry repository.
-```
+```plaintext
 GET /projects/:id/registry/repositories/:repository_id/tags
 ```
@@ -169,7 +169,7 @@ Example response:
 Get details of a registry repository tag.
-```
+```plaintext
 GET /projects/:id/registry/repositories/:repository_id/tags/:tag_name
 ```
@@ -202,7 +202,7 @@ Example response:
 Delete a registry repository tag.
-```
+```plaintext
 DELETE /projects/:id/registry/repositories/:repository_id/tags/:tag_name
 ```
@@ -223,7 +223,7 @@ This action does not delete blobs. In order to delete them and recycle disk spac
 Delete registry repository tags in bulk based on given criteria.
-```
+```plaintext
 DELETE /projects/:id/registry/repositories/:repository_id/tags
 ```

doc/api/custom_attributes.md

@@ -9,7 +9,7 @@ which will be referred to as "resource" in this documentation.
 Get all custom attributes on a resource.
-```
+```plaintext
 GET /users/:id/custom_attributes
 GET /groups/:id/custom_attributes
 GET /projects/:id/custom_attributes
@@ -42,7 +42,7 @@ Example response:
 Get a single custom attribute on a resource.
-```
+```plaintext
 GET /users/:id/custom_attributes/:key
 GET /groups/:id/custom_attributes/:key
 GET /projects/:id/custom_attributes/:key
@@ -71,7 +71,7 @@ Example response:
 Set a custom attribute on a resource. The attribute will be updated if it already exists,
 or newly created otherwise.
-```
+```plaintext
 PUT /users/:id/custom_attributes/:key
 PUT /groups/:id/custom_attributes/:key
 PUT /projects/:id/custom_attributes/:key
@@ -100,7 +100,7 @@ Example response:
 Delete a custom attribute on a resource.
-```
+```plaintext
 DELETE /users/:id/custom_attributes/:key
 DELETE /groups/:id/custom_attributes/:key
 DELETE /projects/:id/custom_attributes/:key

doc/api/dependencies.md

@@ -16,7 +16,7 @@ Get a list of project dependencies. This API partially mirroring
 This list can be generated only for [languages and package managers](../user/application_security/dependency_scanning/index.md#supported-languages-and-package-managers)
 supported by Gemnasium.
-```
+```plaintext
 GET /projects/:id/dependencies
 GET /projects/:id/dependencies?package_manager=maven
 GET /projects/:id/dependencies?package_manager=yarn,bundler

doc/api/deploy_keys.md

@@ -4,7 +4,7 @@
 Get a list of all deploy keys across all projects of the GitLab instance. This endpoint requires admin access.
-```
+```plaintext
 GET /deploy_keys
 ```
@@ -35,7 +35,7 @@ Example response:
 Get a list of a project's deploy keys.
-```
+```plaintext
 GET /projects/:id/deploy_keys
 ```
@@ -72,7 +72,7 @@ Example response:
 Get a single key.
-```
+```plaintext
 GET /projects/:id/deploy_keys/:key_id
 ```
@@ -106,7 +106,7 @@ Creates a new deploy key for a project.
 If the deploy key already exists in another project, it will be joined to current
 project only if original one is accessible by the same user.
-```
+```plaintext
 POST /projects/:id/deploy_keys
 ```
@@ -137,7 +137,7 @@ Example response:
 Updates a deploy key for a project.
-```
+```plaintext
 PUT /projects/:id/deploy_keys/:key_id
 ```
@@ -167,7 +167,7 @@ Example response:
 Removes a deploy key from the project. If the deploy key is used only for this project, it will be deleted from the system.
-```
+```plaintext
 DELETE /projects/:id/deploy_keys/:key_id
 ```

doc/api/deployments.md

@@ -4,7 +4,7 @@
 Get a list of deployments in a project.
-```
+```plaintext
 GET /projects/:id/deployments
 ```
@@ -177,7 +177,7 @@ Example of response
 ## Get a specific deployment
-```
+```plaintext
 GET /projects/:id/deployments/:deployment_id
 ```
@@ -265,7 +265,7 @@ Example of response
 ## Create a deployment
-```
+```plaintext
 POST /projects/:id/deployments
 ```
@@ -319,7 +319,7 @@ Example of a response:
 ## Updating a deployment
-```
+```plaintext
 PUT /projects/:id/deployments/:deployment_id
 ```
@@ -366,7 +366,7 @@ Example of a response:
 This API retrieves the list of merge requests shipped with a given deployment:
-```
+```plaintext
 GET /projects/:id/deployments/:deployment_id/merge_requests
 ```

doc/api/discussions.md

@@ -22,7 +22,7 @@ Read more on [pagination](README.md#pagination).
 Gets a list of all discussion items for a single issue.
-```
+```plaintext
 GET /projects/:id/issues/:issue_iid/discussions
 ```
@@ -118,7 +118,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Returns a single discussion item for a specific project issue
-```
+```plaintext
 GET /projects/:id/issues/:issue_iid/discussions/:discussion_id
 ```
@@ -138,7 +138,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Creates a new thread to a single project issue. This is similar to creating a note but other comments (replies) can be added to it later.
-```
+```plaintext
 POST /projects/:id/issues/:issue_iid/discussions
 ```
@@ -162,7 +162,7 @@ Adds a new note to the thread. This can also [create a thread from a single comm
 **WARNING**
 Notes can be added to other items than comments (system notes, etc.) making them threads.
-```
+```plaintext
 POST /projects/:id/issues/:issue_iid/discussions/:discussion_id/notes
 ```
@@ -185,7 +185,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Modify existing thread note of an issue.
-```
+```plaintext
 PUT /projects/:id/issues/:issue_iid/discussions/:discussion_id/notes/:note_id
 ```
@@ -207,7 +207,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Deletes an existing thread note of an issue.
-```
+```plaintext
 DELETE /projects/:id/issues/:issue_iid/discussions/:discussion_id/notes/:note_id
 ```
@@ -230,7 +230,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" https://gitl
 Gets a list of all discussion items for a single snippet.
-```
+```plaintext
 GET /projects/:id/snippets/:snippet_id/discussions
 ```
@@ -326,7 +326,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Returns a single discussion item for a specific project snippet
-```
+```plaintext
 GET /projects/:id/snippets/:snippet_id/discussions/:discussion_id
 ```
@@ -347,7 +347,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Creates a new thread to a single project snippet. This is similar to creating
 a note but other comments (replies) can be added to it later.
-```
+```plaintext
 POST /projects/:id/snippets/:snippet_id/discussions
 ```
@@ -368,7 +368,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Adds a new note to the thread.
-```
+```plaintext
 POST /projects/:id/snippets/:snippet_id/discussions/:discussion_id/notes
 ```
@@ -391,7 +391,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Modify existing thread note of a snippet.
-```
+```plaintext
 PUT /projects/:id/snippets/:snippet_id/discussions/:discussion_id/notes/:note_id
 ```
@@ -413,7 +413,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Deletes an existing thread note of a snippet.
-```
+```plaintext
 DELETE /projects/:id/snippets/:snippet_id/discussions/:discussion_id/notes/:note_id
 ```
@@ -436,7 +436,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" https://gitl
 Gets a list of all discussion items for a single epic.
-```
+```plaintext
 GET /groups/:id/epics/:epic_id/discussions
 ```
@@ -533,7 +533,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Returns a single discussion item for a specific group epic
-```
+```plaintext
 GET /groups/:id/epics/:epic_id/discussions/:discussion_id
 ```
@@ -554,7 +554,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Creates a new thread to a single group epic. This is similar to creating
 a note but but other comments (replies) can be added to it later.
-```
+```plaintext
 POST /groups/:id/epics/:epic_id/discussions
 ```
@@ -576,7 +576,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Adds a new note to the thread. This can also
 [create a thread from a single comment](../user/discussions/#start-a-thread-by-replying-to-a-standard-comment).
-```
+```plaintext
 POST /groups/:id/epics/:epic_id/discussions/:discussion_id/notes
 ```
@@ -599,7 +599,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Modify existing thread note of an epic.
-```
+```plaintext
 PUT /groups/:id/epics/:epic_id/discussions/:discussion_id/notes/:note_id
 ```
@@ -621,7 +621,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Deletes an existing thread note of an epic.
-```
+```plaintext
 DELETE /groups/:id/epics/:epic_id/discussions/:discussion_id/notes/:note_id
 ```
@@ -644,7 +644,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" https://gitl
 Gets a list of all discussion items for a single merge request.
-```
+```plaintext
 GET /projects/:id/merge_requests/:merge_request_iid/discussions
 ```
@@ -793,7 +793,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Returns a single discussion item for a specific project merge request
-```
+```plaintext
 GET /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id
 ```
@@ -814,7 +814,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Creates a new thread to a single project merge request. This is similar to creating
 a note but other comments (replies) can be added to it later.
-```
+```plaintext
 POST /projects/:id/merge_requests/:merge_request_iid/discussions
 ```
@@ -848,7 +848,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Resolve/unresolve whole thread of a merge request.
-```
+```plaintext
 PUT /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id
 ```
@@ -870,7 +870,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Adds a new note to the thread. This can also
 [create a thread from a single comment](../user/discussions/#start-a-thread-by-replying-to-a-standard-comment).
-```
+```plaintext
 POST /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id/notes
 ```
@@ -893,7 +893,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Modify or resolve an existing thread note of a merge request.
-```
+```plaintext
 PUT /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id/notes/:note_id
 ```
@@ -922,7 +922,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Deletes an existing thread note of a merge request.
-```
+```plaintext
 DELETE /projects/:id/merge_requests/:merge_request_iid/discussions/:discussion_id/notes/:note_id
 ```
@@ -945,7 +945,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" https://gitl
 Gets a list of all discussion items for a single commit.
-```
+```plaintext
 GET /projects/:id/commits/:commit_id/discussions
 ```
@@ -1086,7 +1086,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Returns a single discussion item for a specific project commit
-```
+```plaintext
 GET /projects/:id/commits/:commit_id/discussions/:discussion_id
 ```
@@ -1107,7 +1107,7 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/ap
 Creates a new thread to a single project commit. This is similar to creating
 a note but other comments (replies) can be added to it later.
-```
+```plaintext
 POST /projects/:id/commits/:commit_id/discussions
 ```
@@ -1141,7 +1141,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Adds a new note to the thread.
-```
+```plaintext
 POST /projects/:id/commits/:commit_id/discussions/:discussion_id/notes
 ```
@@ -1164,7 +1164,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab
 Modify or resolve an existing thread note of a commit.
-```
+```plaintext
 PUT /projects/:id/commits/:commit_id/discussions/:discussion_id/notes/:note_id
 ```
@@ -1192,7 +1192,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.
 Deletes an existing thread note of a commit.
-```
+```plaintext
 DELETE /projects/:id/commits/:commit_id/discussions/:discussion_id/notes/:note_id
 ```

doc/api/environments.md

@@ -4,7 +4,7 @@
 Get all environments for a given project.
-```
+```plaintext
 GET /projects/:id/environments
 ```
@@ -34,7 +34,7 @@ Example response:
 ## Get a specific environment
-```
+```plaintext
 GET /projects/:id/environments/:environment_id
 ```
@@ -145,7 +145,7 @@ Creates a new environment with the given name and external_url.
 It returns `201` if the environment was successfully created, `400` for wrong parameters.
-```
+```plaintext
 POST /projects/:id/environments
 ```
@@ -177,7 +177,7 @@ Updates an existing environment's name and/or external_url.
 It returns `200` if the environment was successfully updated. In case of an error, a status code `400` is returned.
-```
+```plaintext
 PUT /projects/:id/environments/:environments_id
 ```
@@ -208,7 +208,7 @@ Example response:
 It returns `204` if the environment was successfully deleted, and `404` if the environment does not exist.
-```
+```plaintext
 DELETE /projects/:id/environments/:environment_id
 ```
@@ -225,7 +225,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 It returns `200` if the environment was successfully stopped, and `404` if the environment does not exist.
-```
+```plaintext
 POST /projects/:id/environments/:environment_id/stop
 ```

doc/api/epic_issues.md

@@ -10,7 +10,7 @@ Epics are available only in Ultimate. If epics feature is not available a `403`
 Gets all issues that are assigned to an epic and the authenticated user has  access to.
-```
+```plaintext
 GET /groups/:id/epics/:epic_iid/issues
 ```
@@ -106,7 +106,7 @@ Example response:
 Creates an epic - issue association. If the issue in question belongs to another epic it is unassigned from that epic.
-```
+```plaintext
 POST /groups/:id/epics/:epic_iid/issues/:issue_id
 ```
@@ -212,7 +212,7 @@ Example response:
 Removes an epic - issue association.
-```
+```plaintext
 DELETE /groups/:id/epics/:epic_iid/issues/:epic_issue_id
 ```
@@ -318,7 +318,7 @@ Example response:
 Updates an epic - issue association.
-```
+```plaintext
 PUT /groups/:id/epics/:epic_iid/issues/:epic_issue_id
 ```