<p>New ChangesetComment model and join table between users and changsets for comments subscriptions<br>
Made commeting changesets possible via "browse" interface<br>
Comments feed for all changsets, particular changeset<br>
Email notifications of new comments on "subscribed to" changesets</p>

<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/ukasiu/openstreetmap-website changeset_comments_pr</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/772'>https://github.com/openstreetmap/openstreetmap-website/pull/772</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>tl;dr Changeset discussion feature</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-0">.gitignore</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-1">app/assets/javascripts/index.js</a>
    (3)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-2">app/assets/javascripts/index/changeset.js</a>
    (80)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-3">app/assets/stylesheets/common.css.scss</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-4">app/controllers/browse_controller.rb</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-5">app/controllers/changeset_controller.rb</a>
    (175)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-6">app/models/changeset.rb</a>
    (3)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-7">app/models/changeset_comment.rb</a>
    (17)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-8">app/models/notifier.rb</a>
    (20)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-9">app/models/user.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-10">app/views/browse/changeset.html.erb</a>
    (55)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-11">app/views/changeset/_changeset.xml.builder</a>
    (26)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-12">app/views/changeset/_comment.html.erb</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-13">app/views/changeset/_comments.rss.builder</a>
    (19)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-14">app/views/changeset/_comments_entry.html.erb</a>
    (3)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-15">app/views/changeset/comments_feed.rss.builder</a>
    (14)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-16">app/views/changeset/show.xml.builder</a>
    (5)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-17">app/views/notifier/changeset_comment_notification.html.erb</a>
    (22)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-18">app/views/notifier/changeset_comment_notification.text.erb</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-19">config/locales/en.yml</a>
    (29)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-20">config/routes.rb</a>
    (8)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-21">db/migrate/20140507110937_create_changeset_comments.rb</a>
    (16)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-22">db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-23">db/structure.sql</a>
    (118)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-24">lib/osm.rb</a>
    (51)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-25">test/controllers/changeset_controller_test.rb</a>
    (272)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-26">test/controllers/relation_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-27">test/fixtures/changeset_comments.yml</a>
    (31)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-28">test/integration/user_changeset_comments_test.rb</a>
    (49)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772/files#diff-29">test/models/changeset_comment_test.rb</a>
    (41)
  </li>
</ul>

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

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/openstreetmap/openstreetmap-website/pull/772">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/1419053__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxOTc2MDcxNiwiZGF0YSI6eyJpZCI6MzU4NjU3NjJ9fQ==--06a7ea3b65b46c732b58468c07bef1b5cab59b50.gif" width="1" /></p>