Merge branch 'master' into overpass

diff --cc app/assets/javascripts/index.js
index 236ed44fc190de0410a0145fb0cfddd6d1b6ad13,0cf08f84539f50321dcff5caa35f368a2fbcda8e..191f390bf4941363049d61981db189ea0f17313b
--- 1/app/assets/javascripts/index.js
--- 2/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -13,7 -12,7 +13,8 @@@
  //= require index/history
  //= require index/note
  //= require index/new_note
+ //= require index/changeset
 +//= require index/query
  //= require router
  
  (function() {
@@@ -302,8 -305,7 +312,8 @@@ $(document).ready(function () 
      "/node/:id(/history)":         OSM.Browse(map, 'node'),
      "/way/:id(/history)":          OSM.Browse(map, 'way'),
      "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
-     "/changeset/:id":              OSM.Browse(map, 'changeset'),
 -    "/changeset/:id":              OSM.Changeset(map)
++    "/changeset/:id":              OSM.Changeset(map),
 +    "/query":                      OSM.Query(map)
    });
  
    if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {

diff --cc app/assets/stylesheets/common.css.scss
Simple merge

diff --cc config/example.application.yml
index 7f6aaf298e5165b795a178a5fd5c405a0c05a01e,3fbebdc766c5d82424682433381aeeb5246463ca..e7915c96b7699924de9f98a1a06e8479a0575c07
--- 1/config/example.application.yml
--- 2/config/example.application.yml
+++ b/config/example.application.yml
@@@ -84,8 -84,11 +84,13 @@@ defaults: &default
    require_terms_seen: false
    # Whether to require users to agree to the CTs before editing
    require_terms_agreed: false
+   # Imagery to return in capabilities as blacklisted
+   imagery_blacklist:
+     - ".*\\.googleapis\\.com/.*"
+     - ".*\\.google\\.com/.*"
+     - ".*\\.google\\.ru/.*"
 +  # URL of Overpass instance to use for feature queries
 +  overpass_url: "//overpass-api.de/api/interpreter"
  
  development:
    <<: *defaults

diff --cc config/locales/en.yml
index eb2991d4e1c96792c71b5060dadb493a514e9fc4,021151052ed5c13806fe4c3bfb185687e3134000..69e52e44dfd685b685cf8a9102838c0bf9af3eb3
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2109,8 -2126,13 +2133,15 @@@ en
        createnote_disabled_tooltip: Zoom in to add a note to the map
        map_notes_zoom_in_tooltip: Zoom in to see map notes
        map_data_zoom_in_tooltip: Zoom in to see map data
 +      queryfeature_tooltip: Query features
 +      queryfeature_disabled_tooltip: Zoom in to query features
+     changesets:
+       show:
+         comment: "Comment"
+         subscribe: "Subscribe"
+         unsubscribe: "Unsubscribe"
+         hide_comment: "hide"
+         unhide_comment: "unhide"
      notes:
        new:
          intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"

diff --cc config/routes.rb
Simple merge

diff --cc db/structure.sql
index 1d6170bc416e62ca968b60f8f4d4204a5785e489,c287baea38197e16737ff0143af5866b58d14a0a..343aec084abbc9b1ac43026e1839ca5c41c5647b
--- 1/db/structure.sql
--- 2/db/structure.sql
+++ b/db/structure.sql
@@@ -126,7 -126,7 +126,7 @@@ CREATE TYPE user_status_enum AS ENUM 
  
  CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer
      LANGUAGE c STRICT
-     AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point';
 -    AS '/home/ukasiu/repos/openstreetmap-website/db/functions/libpgosm', 'maptile_for_point';
++    AS '/srv/www/overpass.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point';
  
  
  --
@@@ -135,7 -135,7 +135,7 @@@
  
  CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint
      LANGUAGE c STRICT
-     AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point';
 -    AS '/home/ukasiu/repos/openstreetmap-website/db/functions/libpgosm', 'tile_for_point';
++    AS '/srv/www/overpass.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point';
  
  
  --
@@@ -143,8 -143,8 +143,8 @@@
  --
  
  CREATE FUNCTION xid_to_int4(xid) RETURNS integer
 -    LANGUAGE c STRICT
 -    AS '/home/ukasiu/repos/openstreetmap-website/db/functions/libpgosm', 'xid_to_int4';
 +    LANGUAGE c IMMUTABLE STRICT
-     AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4';
++    AS '/srv/www/overpass.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4';
  
  
  SET default_tablespace = '';
@@@ -1737,6 -1795,34 +1795,27 @@@ CREATE INDEX gpx_files_user_id_idx ON g
  CREATE INDEX gpx_files_visible_visibility_idx ON gpx_files USING btree (visible, visibility);
  
  
 ---
 --- Name: index_changeset_comments_on_body; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 ---
 -
 -CREATE INDEX index_changeset_comments_on_body ON changeset_comments USING btree (body);
 -
 -
+ --
+ -- Name: index_changeset_comments_on_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE INDEX index_changeset_comments_on_created_at ON changeset_comments USING btree (created_at);
+ 
+ 
+ --
+ -- Name: index_changesets_subscribers_on_changeset_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE INDEX index_changesets_subscribers_on_changeset_id ON changesets_subscribers USING btree (changeset_id);
+ 
+ 
+ --
+ -- Name: index_changesets_subscribers_on_subscriber_id_and_changeset_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+ --
+ 
+ CREATE UNIQUE INDEX index_changesets_subscribers_on_subscriber_id_and_changeset_id ON changesets_subscribers USING btree (subscriber_id, changeset_id);
+ 
+ 
  --
  -- Name: index_client_applications_on_key; Type: INDEX; Schema: public; Owner: -; Tablespace: 
  --
@@@ -2513,3 -2635,3 +2628,4 @@@ INSERT INTO schema_migrations (version
  INSERT INTO schema_migrations (version) VALUES ('8');
  
  INSERT INTO schema_migrations (version) VALUES ('9');
++