]>
git.openstreetmap.org Git - rails.git/log
Bryan Housel [Wed, 29 Aug 2018 05:05:54 +0000 (01:05 -0400)]
Update to iD v2.11.1
Andy Allan [Wed, 29 Aug 2018 04:36:31 +0000 (12:36 +0800)]
Alter the Makefile to be robust against bundler warnings
In bundle < 2.0, warnings are printed to stdout, along with the path information
that we need. This takes the final line of the output and assumes it's the path.
Fixes #1930
Andy Allan [Wed, 29 Aug 2018 03:43:22 +0000 (11:43 +0800)]
Suppress the creation of boot logs from the ubuntu image
The ubuntu image by default creates a logfile during each boot, but this
is uninteresting for our workflow. This switch suppresses the log.
Tom Hughes [Tue, 28 Aug 2018 18:12:01 +0000 (19:12 +0100)]
Fix FactoryBot deprecation warnings
Tom Hughes [Tue, 28 Aug 2018 17:57:32 +0000 (18:57 +0100)]
Update bundle
Tom Hughes [Tue, 28 Aug 2018 17:53:45 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1948'
Tom Hughes [Tue, 28 Aug 2018 17:02:32 +0000 (18:02 +0100)]
Only include embed related messages in the embed javascript
Tom Hughes [Tue, 28 Aug 2018 16:59:46 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/1950'
Tom Hughes [Tue, 28 Aug 2018 16:56:02 +0000 (17:56 +0100)]
Tidy whitespace
Tom Hughes [Tue, 28 Aug 2018 16:55:01 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/1958'
Ilya Zverev [Mon, 27 Aug 2018 12:00:48 +0000 (15:00 +0300)]
Reverse coordinates order only when called with two nondescript numbers
ENT8R [Mon, 27 Aug 2018 14:44:46 +0000 (16:44 +0200)]
Add some more tests, better error handling for dates
Ilya Zverev [Mon, 27 Aug 2018 11:27:13 +0000 (14:27 +0300)]
Adjust test for latlon searching
Ilya Zverev [Mon, 27 Aug 2018 11:06:17 +0000 (14:06 +0300)]
Add parsing coordinates in lon, lat format
translatewiki.net [Mon, 27 Aug 2018 05:53:06 +0000 (07:53 +0200)]
Localisation updates from https://translatewiki.net.
ENT8R [Sun, 26 Aug 2018 17:06:01 +0000 (19:06 +0200)]
Add some more tests
ENT8R [Sun, 26 Aug 2018 14:04:09 +0000 (16:04 +0200)]
Improve code style, fix tests
Bryan Housel [Sun, 26 Aug 2018 06:28:16 +0000 (02:28 -0400)]
Update to iD v2.11.0
ENT8R [Sat, 25 Aug 2018 21:00:11 +0000 (23:00 +0200)]
Enhanced the notes search endpoint with a few features
translatewiki.net [Thu, 23 Aug 2018 06:26:52 +0000 (08:26 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Fri, 17 Aug 2018 13:10:45 +0000 (15:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 16 Aug 2018 10:49:30 +0000 (11:49 +0100)]
Only fetch client side translations for the current locale
mmd-osm [Tue, 14 Aug 2018 08:57:13 +0000 (10:57 +0200)]
Include num_changes in changeset xml response
Tom Hughes [Mon, 13 Aug 2018 16:12:48 +0000 (17:12 +0100)]
Avoid some accidental manouver type matches
translatewiki.net [Mon, 13 Aug 2018 06:21:06 +0000 (08:21 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 12 Aug 2018 19:29:51 +0000 (20:29 +0100)]
Stick with autoprefixer 8.x for now
Tom Hughes [Sun, 12 Aug 2018 19:06:53 +0000 (20:06 +0100)]
Fix bundle dependencies
Tom Hughes [Sun, 12 Aug 2018 18:53:28 +0000 (19:53 +0100)]
Replace sass-rails with sassc-rails
http://sass.logdown.com/posts/
7081811
Tom Hughes [Sun, 12 Aug 2018 18:42:02 +0000 (19:42 +0100)]
Update bundle
translatewiki.net [Thu, 9 Aug 2018 07:34:50 +0000 (09:34 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Aug 2018 05:27:46 +0000 (07:27 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Aug 2018 08:23:36 +0000 (10:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 1 Aug 2018 20:35:51 +0000 (21:35 +0100)]
Set the locale when adding a comment to an issue
Tom Hughes [Wed, 1 Aug 2018 17:56:11 +0000 (18:56 +0100)]
Use dynamic error pages built through the asset pipeline
Fixes #1241
translatewiki.net [Mon, 30 Jul 2018 06:28:19 +0000 (08:28 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 26 Jul 2018 16:44:16 +0000 (17:44 +0100)]
Remove script sources which are no longer needed by iD
Tom Hughes [Thu, 26 Jul 2018 16:38:40 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1939'
J Guthrie [Thu, 26 Jul 2018 15:32:43 +0000 (16:32 +0100)]
Added locale
J Guthrie [Thu, 26 Jul 2018 15:27:28 +0000 (16:27 +0100)]
Refactored and added new test
translatewiki.net [Thu, 26 Jul 2018 08:13:58 +0000 (10:13 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Thu, 26 Jul 2018 05:38:22 +0000 (01:38 -0400)]
Update to iD v2.10.0
J Guthrie [Wed, 25 Jul 2018 01:30:59 +0000 (02:30 +0100)]
Return after rendering - stops further processing in controller
J Guthrie [Wed, 25 Jul 2018 01:04:04 +0000 (02:04 +0100)]
Switched if to unless to satisfy rubycop
J Guthrie [Wed, 25 Jul 2018 00:49:51 +0000 (01:49 +0100)]
No trace description now redirects to /new
translatewiki.net [Mon, 23 Jul 2018 07:43:27 +0000 (09:43 +0200)]
Localisation updates from https://translatewiki.net.
Frederik Ramm [Sun, 22 Jul 2018 13:42:14 +0000 (15:42 +0200)]
allow moderators to read hidden notes through API
translatewiki.net [Fri, 20 Jul 2018 13:10:59 +0000 (15:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 18 Jul 2018 17:59:52 +0000 (18:59 +0100)]
Add issues link to "More" menu for intermediate sized screens
Fixes #1928
Tom Hughes [Wed, 18 Jul 2018 17:42:15 +0000 (18:42 +0100)]
Update leaflet to 1.3.3
Tom Hughes [Tue, 17 Jul 2018 21:48:45 +0000 (22:48 +0100)]
Update leaflet.osm plugin
Tom Hughes [Tue, 17 Jul 2018 21:47:50 +0000 (22:47 +0100)]
Update leaflet to 1.3.2
translatewiki.net [Mon, 16 Jul 2018 15:02:36 +0000 (17:02 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 10 Jul 2018 17:59:15 +0000 (18:59 +0100)]
Block non-localhost requests for all tests
Only blocking them for the system tests didn't actually
work anyway as the setting is global so would apply to all
tests after the first system test.
Tom Hughes [Tue, 10 Jul 2018 17:50:29 +0000 (18:50 +0100)]
Fix nominatim stubs
Tom Hughes [Mon, 9 Jul 2018 21:19:10 +0000 (22:19 +0100)]
Add /api/0.6/users to fetch multiple users
Fixes #1921
Tom Hughes [Mon, 9 Jul 2018 19:36:41 +0000 (20:36 +0100)]
Fix another hostip stub
Tom Hughes [Mon, 9 Jul 2018 19:26:37 +0000 (20:26 +0100)]
Return the "large" image from the user details API call
Closes #1923
Tom Hughes [Mon, 9 Jul 2018 19:15:42 +0000 (20:15 +0100)]
Fix stubbing of hostip requests
translatewiki.net [Thu, 5 Jul 2018 11:52:34 +0000 (13:52 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Jul 2018 06:05:23 +0000 (08:05 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 29 Jun 2018 10:46:54 +0000 (11:46 +0100)]
Convert some URLs to https
Bryan Housel [Thu, 28 Jun 2018 23:23:18 +0000 (19:23 -0400)]
Update to iD v2.9.2
translatewiki.net [Thu, 28 Jun 2018 05:32:30 +0000 (07:32 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Tue, 26 Jun 2018 01:37:25 +0000 (21:37 -0400)]
Update to iD v2.9.1
Tom Hughes [Mon, 25 Jun 2018 13:35:10 +0000 (14:35 +0100)]
Update bundle
translatewiki.net [Mon, 25 Jun 2018 06:20:29 +0000 (08:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 22 Jun 2018 10:59:49 +0000 (11:59 +0100)]
Remove expired banners
Francesco Frassinelli [Mon, 18 Jun 2018 14:30:53 +0000 (16:30 +0200)]
Add SotM 2018 banner
Closes #1905
Tom Hughes [Wed, 20 Jun 2018 10:34:35 +0000 (11:34 +0100)]
Update bundle
translatewiki.net [Thu, 21 Jun 2018 06:26:23 +0000 (08:26 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 20 Jun 2018 07:51:11 +0000 (08:51 +0100)]
Fix daily cleanup script for rails 5.2 compatibility
Tom Hughes [Tue, 19 Jun 2018 17:53:08 +0000 (18:53 +0100)]
Update (as far as possible) to rails 5.2 default configuration
Tom Hughes [Tue, 19 Jun 2018 08:05:32 +0000 (09:05 +0100)]
Fix rubocop warnings
Tom Hughes [Mon, 18 Jun 2018 19:46:00 +0000 (20:46 +0100)]
Update to rails 5.2.0
Tom Hughes [Mon, 18 Jun 2018 08:14:50 +0000 (09:14 +0100)]
Update to rails 5.1.6
Tom Hughes [Mon, 18 Jun 2018 08:00:49 +0000 (09:00 +0100)]
Fix new rubocop warnings
Tom Hughes [Mon, 18 Jun 2018 07:55:34 +0000 (08:55 +0100)]
Update bundle
Tom Hughes [Mon, 18 Jun 2018 07:51:33 +0000 (08:51 +0100)]
Fix broken translation
translatewiki.net [Mon, 18 Jun 2018 06:05:22 +0000 (08:05 +0200)]
Localisation updates from https://translatewiki.net.
Chris Flipse [Mon, 18 Jun 2018 00:27:17 +0000 (20:27 -0400)]
Make rubocop happy
Chris Flipse [Sun, 17 Jun 2018 17:15:49 +0000 (13:15 -0400)]
separate ability and capability
These are asking fundamentally different questions;
Abilities are asking the application if the user has a role that allows
the user to take a certain action
Capabilities are asking if the user has granted the application to
perform a certain type of action
CanCanCan makes no distinction, however, so the `granted_capabilities`
method is provided as a point that can be checked in rescue methods, so
that one can _attempt_ to continue to provide the more informative error
messages around permission refusals
Benjamin Reynolds [Sun, 10 Jun 2018 16:09:32 +0000 (12:09 -0400)]
Authorize actions on GeocoderController with CanCanCan Ability
Chris Flipse [Sun, 10 Jun 2018 17:06:10 +0000 (13:06 -0400)]
Update capabilities check to actually reflect the existing logic
The OAuth capabilities are essentially user permissions that have been
granted to the app. If the user authenticates through a non-oauth
method, they are assumed to have granted all capabilities to the app
Chris Flipse [Sun, 10 Jun 2018 15:31:54 +0000 (11:31 -0400)]
fix and improve ability coverage to account for tokens
Chris Flipse [Sat, 9 Jun 2018 23:53:45 +0000 (19:53 -0400)]
Use cancancan to authorize user_preference_controller
Chris Flipse [Sat, 9 Jun 2018 23:53:17 +0000 (19:53 -0400)]
add test helper to set oauth tokens
Chris Flipse [Sat, 9 Jun 2018 20:35:17 +0000 (16:35 -0400)]
Implement the cancan filters for diary entries
Access logic is not _entirely_ exported from the controller,
unfortunately. For interface reasons, some actions which require admin
have to be listed within the controller's deny_access method.
This is required because, being a default-deny system, cancancan
_cannot_ tell you the reason you were denied access; and so
the "nice" feedback presenting next steps can't be gleaned from
the exception
Chris Flipse [Sat, 9 Jun 2018 20:20:21 +0000 (16:20 -0400)]
use a controller method to handle cancan denials
This will let controllers override for specific circumstances
Chris Flipse [Fri, 8 Jun 2018 20:58:49 +0000 (16:58 -0400)]
use token in ability checks
Chris Flipse [Fri, 8 Jun 2018 20:57:35 +0000 (16:57 -0400)]
fix tests for site controller
Chris Flipse [Fri, 8 Jun 2018 14:21:19 +0000 (10:21 -0400)]
don't check authorization everywhere
Andy Allan [Thu, 1 Mar 2018 02:24:35 +0000 (10:24 +0800)]
Add cancancan and the first ability definitions for site_controller
Tom Hughes [Sun, 17 Jun 2018 10:33:04 +0000 (11:33 +0100)]
Allow inline javascript and CSS in better_errors pages
Tom Hughes [Sun, 17 Jun 2018 10:14:19 +0000 (11:14 +0100)]
Assign vandalism reports for users to moderators
Tom Hughes [Sun, 17 Jun 2018 00:01:24 +0000 (01:01 +0100)]
Only include issues visible to the current user in the count
Tom Hughes [Sat, 16 Jun 2018 15:21:07 +0000 (16:21 +0100)]
Avoid using "other" as a translation key
Tom Hughes [Sat, 16 Jun 2018 11:52:23 +0000 (12:52 +0100)]
Fix typoed expansion variable in translation
Tom Hughes [Sat, 16 Jun 2018 11:40:15 +0000 (12:40 +0100)]
Show count of open issues in the header
Tom Hughes [Sat, 16 Jun 2018 11:14:58 +0000 (12:14 +0100)]
Set the locale for issue and report views
Tom Hughes [Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)]
Merge remote-tracking branch 'upstream/pull/1576'