Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-12

app/views/shared/members/_group.html.haml

@@ -8,7 +8,7 @@
     %strong
       = link_to group.full_name, group_path(group)
     .cgray
-      Joined #{time_ago_with_tooltip(group.created_at)}
+      Given access #{time_ago_with_tooltip(group_link.created_at)}
       - if group_link.expires?
         ·
         %span{ class: ('text-warning' if group_link.expires_soon?) }

app/views/shared/members/_member.html.haml

@@ -29,7 +29,7 @@
             Requested
             = time_ago_with_tooltip(member.requested_at)
           - else
-            Joined #{time_ago_with_tooltip(member.created_at)}
+            Given access #{time_ago_with_tooltip(member.created_at)}
           - if member.expires?
             ·
             %span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) }

changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml

+---
+title: Fix `joined` information on project members page
+merge_request: 18290
+author: Fabian Schneider
+type: fixed

doc/topics/autodevops/index.md

@@ -419,12 +419,12 @@ into your project to enable staging and canary deployments, and more.
 ### Custom buildpacks
 
 If the automatic buildpack detection fails for your project, or if you want to
-use a custom buildpack, you can override the buildpack using a project variable
-or a `.buildpack` file in your project:
+use a custom buildpack, you can override the buildpack(s) using a project variable
+or a `.buildpacks` file in your project:
 
 - **Project variable** - Create a project variable `BUILDPACK_URL` with the URL
   of the buildpack to use.
-- **`.buildpack` file** - Add a file in your project's repo called  `.buildpack`
+- **`.buildpacks` file** - Add a file in your project's repo called  `.buildpacks`
   and add the URL of the buildpack to use on a line in the file. If you want to
   use multiple buildpacks, you can enter them in, one on each line.