<p>Add an icon for OSMF membership, similar to user roles.<br>
Creates a new table for memberships, and adds an optional setting<br>
on the user settings page to select if the user wants the<br>
membership to be displayed on to user page or not.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/1914'>https://github.com/openstreetmap/openstreetmap-website/pull/1914</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>add icon for OSMF membership to user page</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-0">app/assets/images/membership/OSMF.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-1">app/assets/images/membership/OSMF.svg</a>
    (200)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-2">app/controllers/user_controller.rb</a>
    (11)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-3">app/helpers/user_membership_helper.rb</a>
    (24)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-4">app/models/user.rb</a>
    (14)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-5">app/models/user_membership.rb</a>
    (21)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-6">app/views/user/account.html.erb</a>
    (15)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-7">app/views/user/view.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-8">config/locales/en.yml</a>
    (3)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-9">db/migrate/20180616202225_create_user_memberships.rb</a>
    (20)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-10">db/structure.sql</a>
    (61)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-11">test/factories/user.rb</a>
    (6)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-12">test/factories/user_membership.rb</a>
    (5)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-13">test/integration/user_membership_test.rb</a>
    (68)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1914.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/1914.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1914.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/1914.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1914">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLXn8B5YwCSLJIvd5HIwlw1bHtof5ks5t_3wogaJpZM4U1H6q">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABWnLZxudltRsGyxpHwsQ8XKYA04ieXeks5t_3wogaJpZM4U1H6q.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","potentialAction":{"@type":"ViewAction","target":"https://github.com/openstreetmap/openstreetmap-website/pull/1914","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1914","name":"View Pull Request"},"description":"View this Pull Request on GitHub","publisher":{"@type":"Organization","name":"GitHub","url":"https://github.com"}}</script>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"add icon for OSMF membership to user page (#1914)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1914"}}}</script>
<script type="application/ld+json">{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "add icon for OSMF membership to user page (#1914)",
"sections": [
{
"text": "",
"activityTitle": "**datendelphin**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@datendelphin",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "4694c7b",
"value": "add icon for OSMF membership to user page"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Added",
"value": "[app/assets/images/membership/OSMF.png](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-0) (0 changes)"
},
{
"name": "Added",
"value": "[app/assets/images/membership/OSMF.svg](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-1) (200 changes)"
},
{
"name": "Modified",
"value": "[app/controllers/user_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-2) (11 changes)"
},
{
"name": "Added",
"value": "[app/helpers/user_membership_helper.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-3) (24 changes)"
},
{
"name": "Modified",
"value": "[app/models/user.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-4) (14 changes)"
},
{
"name": "Added",
"value": "[app/models/user_membership.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-5) (21 changes)"
},
{
"name": "Modified",
"value": "[app/views/user/account.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-6) (15 changes)"
},
{
"name": "Modified",
"value": "[app/views/user/view.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-7) (2 changes)"
},
{
"name": "Modified",
"value": "[config/locales/en.yml](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-8) (3 changes)"
},
{
"name": "Added",
"value": "[db/migrate/20180616202225_create_user_memberships.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-9) (20 changes)"
},
{
"name": "Modified",
"value": "[db/structure.sql](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-10) (61 changes)"
},
{
"name": "Modified",
"value": "[test/factories/user.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-11) (6 changes)"
},
{
"name": "Added",
"value": "[test/factories/user_membership.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-12) (5 changes)"
},
{
"name": "Added",
"value": "[test/integration/user_membership_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1914/files#diff-13) (68 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"issueId\": 1914,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"pullRequestId\": 1914\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1914"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1914.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1914.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 349470378\n}"
}
],
"themeColor": "26292E"
}</script>