]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 20 Mar 2019 13:37:39 +0000 (14:37 +0100)]
Mark all methods in api_controller and application_controller as private
They aren't designed to be used as request endpoints, so there's no
need for them to be public.
Andy Allan [Wed, 20 Mar 2019 14:07:33 +0000 (15:07 +0100)]
Use a lambda in order to pass parameters in before_actions
This avoid calling methods on a new instance of the controller, and
therefore allows these methods to be marked as private.
As a bonus, rubocop can now parse them and warn when they refer to
actions that don't exist in the controller.
Andy Allan [Wed, 20 Mar 2019 13:36:43 +0000 (14:36 +0100)]
Move the authorize method to api_controller
Andy Allan [Wed, 20 Mar 2019 13:27:05 +0000 (14:27 +0100)]
Simplify deny_access handling
Now that we have all api controllers inheriting from a common base,
it's easier to override the deny_access handler without having to
switch between both.
Fixes #2064
Andy Allan [Wed, 20 Mar 2019 13:16:15 +0000 (14:16 +0100)]
Refactor api controllers to inherit from a common ApiController
Tom Hughes [Tue, 19 Mar 2019 14:08:43 +0000 (14:08 +0000)]
Fix travis
Tom Hughes [Tue, 19 Mar 2019 13:29:49 +0000 (13:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2182'
Michael Reichert [Mon, 18 Mar 2019 21:16:25 +0000 (22:16 +0100)]
Add banner against EU Copyright Directive
Set end date to 2019-03-26 because the topic is tabled on 26 March
according to the agenda.
translatewiki.net [Mon, 18 Mar 2019 07:57:33 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 17 Mar 2019 10:49:21 +0000 (10:49 +0000)]
Move application.yml check to config initializer
Tom Hughes [Sat, 16 Mar 2019 16:29:12 +0000 (16:29 +0000)]
Move status into the settings object
Only the very early boot code needs to look at the value
from the environment directly.
Tom Hughes [Sat, 16 Mar 2019 16:52:08 +0000 (16:52 +0000)]
Fix database offline mode
Tom Hughes [Sat, 16 Mar 2019 15:41:35 +0000 (15:41 +0000)]
Sort gitignore
Tom Hughes [Sat, 16 Mar 2019 15:40:23 +0000 (15:40 +0000)]
Add comment
Tom Hughes [Sat, 16 Mar 2019 15:39:03 +0000 (15:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2177'
Tom Hughes [Sat, 16 Mar 2019 15:31:29 +0000 (15:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2164'
Andy Allan [Wed, 13 Mar 2019 11:14:31 +0000 (12:14 +0100)]
Rubocop fix
Andy Allan [Wed, 13 Mar 2019 11:06:19 +0000 (12:06 +0100)]
Rubocop fixes
Andy Allan [Wed, 13 Mar 2019 11:04:54 +0000 (12:04 +0100)]
Move changeset builder views to the api namespace
Frederik Ramm [Fri, 1 Mar 2019 00:11:19 +0000 (01:11 +0100)]
Move changeset XML generation to a view
Tom Hughes [Fri, 15 Mar 2019 10:44:16 +0000 (10:44 +0000)]
Add missing dependency
Tom Hughes [Fri, 15 Mar 2019 10:18:29 +0000 (10:18 +0000)]
Add missing dependencies
Tom Hughes [Fri, 15 Mar 2019 09:30:17 +0000 (09:30 +0000)]
Update to rails 5.2.2.1
Tom Hughes [Fri, 15 Mar 2019 09:27:38 +0000 (09:27 +0000)]
Update bundle
Tom Hughes [Fri, 15 Mar 2019 09:17:28 +0000 (09:17 +0000)]
Add Spanish attribution to copyright page
Fixes #2179
translatewiki.net [Thu, 14 Mar 2019 12:14:50 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 13 Mar 2019 17:41:57 +0000 (18:41 +0100)]
Remove application.yml step from travis config
Andy Allan [Wed, 13 Mar 2019 17:20:08 +0000 (18:20 +0100)]
Provide a helpful warning if there's an application.yml file detected
Andy Allan [Wed, 13 Mar 2019 16:57:51 +0000 (17:57 +0100)]
Add some settings validations
Andy Allan [Wed, 13 Mar 2019 16:54:41 +0000 (17:54 +0100)]
Update documentation for new approach to settings
Andy Allan [Wed, 13 Mar 2019 16:51:43 +0000 (17:51 +0100)]
Instruct sprockets to recompile this file based on the settings files changing
Andy Allan [Wed, 13 Mar 2019 16:33:28 +0000 (17:33 +0100)]
Only take the STATUS configuration from the environment
This allows us to remove the preinitializer-based configuration parsing.
Andy Allan [Wed, 13 Mar 2019 15:40:31 +0000 (16:40 +0100)]
Drop the old environment variable parsing
It's likely unused, and incompatible with environment variable parsing from Config
Andy Allan [Wed, 13 Mar 2019 15:38:03 +0000 (16:38 +0100)]
Move all settings to settings.yml
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
Andy Allan [Wed, 13 Mar 2019 13:05:39 +0000 (14:05 +0100)]
Install config gem for settings management
translatewiki.net [Mon, 11 Mar 2019 10:29:31 +0000 (11:29 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 8 Mar 2019 11:17:51 +0000 (11:17 +0000)]
Prevent leading and trailing whitespace on email addresses
Tom Hughes [Fri, 8 Mar 2019 10:58:42 +0000 (10:58 +0000)]
Strip leading and trailing whitespace for email authentication
Fixes #2173
translatewiki.net [Thu, 7 Mar 2019 15:23:12 +0000 (16:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Mar 2019 17:23:46 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2167'
Andy Allan [Wed, 6 Mar 2019 08:54:05 +0000 (09:54 +0100)]
Silence the simplecov output message
It's very rare for the information in this message to be useful or
actionable when running the tests, so it's best to silence the message.
Richard Fairhurst [Thu, 28 Feb 2019 21:44:44 +0000 (21:44 +0000)]
Update OS copyright year
Tom Hughes [Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2161'
Tom Hughes [Thu, 28 Feb 2019 18:58:05 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2160'
Andy Allan [Sun, 24 Feb 2019 15:21:29 +0000 (16:21 +0100)]
Move the api trace methods into a separate controller under the api namespace
Andy Allan [Sun, 24 Feb 2019 15:06:07 +0000 (16:06 +0100)]
Fix test file name
Andy Allan [Sun, 24 Feb 2019 14:52:20 +0000 (15:52 +0100)]
Move the amf and swf controllers into the api namespace
Andy Allan [Sun, 24 Feb 2019 14:46:25 +0000 (15:46 +0100)]
Move the notes api methods into a controller in the api namespace
Andy Allan [Sun, 24 Feb 2019 13:34:15 +0000 (14:34 +0100)]
Move the user api methods into a separate controller in the api namespace
Andy Allan [Sun, 24 Feb 2019 12:37:03 +0000 (13:37 +0100)]
Move node/way/relation/old_* controllers into the api namespace
Quincy Morgan [Tue, 26 Feb 2019 18:52:10 +0000 (13:52 -0500)]
Update to iD v2.14.3
Tom Hughes [Mon, 25 Feb 2019 18:58:19 +0000 (18:58 +0000)]
Flip header image horizontally on RTL pages
Fixes #2158
Tom Hughes [Mon, 25 Feb 2019 18:50:40 +0000 (18:50 +0000)]
Prevent reversal of sprite positions on welcome screen
Fixes #2156
Tom Hughes [Mon, 25 Feb 2019 11:44:24 +0000 (11:44 +0000)]
Avoid CSP issues with OpenID login
To avoid Chrom getting upset about sending form data to sites
that our policy doesn't allow, even when it isn't, use Javascript
to jump straight to Omniauth as the direct OpenID based login
buttons were already doing.
Fixes #1909
translatewiki.net [Mon, 25 Feb 2019 09:54:34 +0000 (10:54 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Feb 2019 22:40:01 +0000 (22:40 +0000)]
Allow loading of our manifest
Andy Allan [Sun, 24 Feb 2019 11:47:26 +0000 (12:47 +0100)]
Move the user preferences controller into the api namespace
Andy Allan [Sun, 24 Feb 2019 11:42:07 +0000 (12:42 +0100)]
Move the search controller to the api namespace
Andy Allan [Sun, 24 Feb 2019 11:38:09 +0000 (12:38 +0100)]
Move the api methods from changeset_comments_controller into the api namespaced controller
Andy Allan [Sun, 24 Feb 2019 11:18:31 +0000 (12:18 +0100)]
Move the api methods from changesets_controller into the api namespaced controller
Andy Allan [Sun, 24 Feb 2019 09:42:01 +0000 (10:42 +0100)]
Move map method to its own controller
Andy Allan [Sun, 24 Feb 2019 09:27:48 +0000 (10:27 +0100)]
Move the changes api to its own controller
Andy Allan [Sat, 23 Feb 2019 15:06:30 +0000 (16:06 +0100)]
Move the permissions call out of api_controller
Andy Allan [Sat, 23 Feb 2019 14:59:45 +0000 (15:59 +0100)]
Rename api controller test files
Andy Allan [Sat, 23 Feb 2019 14:53:49 +0000 (15:53 +0100)]
Move the trackpoints call into its own controller (and rename to tracepoints)
Andy Allan [Sat, 23 Feb 2019 13:36:02 +0000 (14:36 +0100)]
Move the capabilities call out of api_controller
Tom Hughes [Fri, 22 Feb 2019 15:41:33 +0000 (15:41 +0000)]
Improve detection of browsers needing ES6 shims
Tom Hughes [Thu, 21 Feb 2019 23:00:55 +0000 (23:00 +0000)]
Merge remote-tracking branch 'upstream/pull/2153'
Quincy Morgan [Thu, 21 Feb 2019 22:06:43 +0000 (17:06 -0500)]
Update to iD v2.14.2
Tom Hughes [Wed, 20 Feb 2019 23:57:50 +0000 (23:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2152'
Quincy Morgan [Wed, 20 Feb 2019 23:30:22 +0000 (18:30 -0500)]
Update to iD v2.14.1
Tom Hughes [Wed, 20 Feb 2019 22:13:50 +0000 (22:13 +0000)]
Merge remote-tracking branch 'upstream/pull/2151'
Tom Hughes [Wed, 20 Feb 2019 21:46:21 +0000 (21:46 +0000)]
Avoid bundler 2.x for now
Fixes #2149
Quincy Morgan [Wed, 20 Feb 2019 21:43:54 +0000 (16:43 -0500)]
Update to iD v2.14.0
Tom Hughes [Tue, 19 Feb 2019 10:06:58 +0000 (10:06 +0000)]
Set language and text direction properly on the copyright page
Also add style overrides for explicit LTR and RTL text that work
independently of the main page styling.
Fixes #2148
translatewiki.net [Mon, 18 Feb 2019 07:13:52 +0000 (08:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Feb 2019 21:25:34 +0000 (21:25 +0000)]
Revert to rinku 2.0.4
Tom Hughes [Thu, 14 Feb 2019 19:24:46 +0000 (19:24 +0000)]
Revert to bootsnap 1.3.2
translatewiki.net [Thu, 14 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 13 Feb 2019 18:45:32 +0000 (18:45 +0000)]
Update bundle
Tom Hughes [Thu, 7 Feb 2019 20:21:40 +0000 (20:21 +0000)]
Update tests for changes in FactoryBot 5.x
Tom Hughes [Thu, 7 Feb 2019 18:41:36 +0000 (18:41 +0000)]
Update bundle
Tom Hughes [Thu, 7 Feb 2019 18:40:35 +0000 (18:40 +0000)]
Always look to the global scope for the GPX module
translatewiki.net [Thu, 7 Feb 2019 15:07:57 +0000 (16:07 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Feb 2019 18:30:41 +0000 (18:30 +0000)]
Merge remote-tracking branch 'upstream/pull/2136'
Tom Hughes [Wed, 6 Feb 2019 18:21:50 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2135'
Tom Hughes [Wed, 6 Feb 2019 18:17:03 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2134'
Tom Hughes [Wed, 6 Feb 2019 18:15:40 +0000 (18:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2125'
Andy Allan [Wed, 6 Feb 2019 17:12:20 +0000 (18:12 +0100)]
Output both the local simplecov html and the coveralls report
Fixes #2066
Andy Allan [Wed, 6 Feb 2019 16:00:05 +0000 (17:00 +0100)]
Merge pull request #2126 from MaZderMind/patch-1
Advise to run i18n:js:export before assets:precompile
Andy Allan [Wed, 6 Feb 2019 15:59:27 +0000 (16:59 +0100)]
Fix typo
Andy Allan [Wed, 6 Feb 2019 14:50:57 +0000 (15:50 +0100)]
Remove require_terms_agreed configuration option
This has been set to true for 6 years in production. Refs #2097
As per other user settings, we set the terms as seen by default for tests,
and we can override that when necessary for specific tests.
Andy Allan [Wed, 6 Feb 2019 13:54:56 +0000 (14:54 +0100)]
Remove the require_terms_seen configuration option
This option has been set to 'true' for over six years in production.
Refs #2097
Andy Allan [Wed, 6 Feb 2019 13:20:03 +0000 (14:20 +0100)]
Copy i18n strings from validates_email_format_of plugin
This allows our translators to work in languages not yet supported
by the upstream plugin. Fixes #2128
Andy Allan [Wed, 6 Feb 2019 11:25:43 +0000 (12:25 +0100)]
Remove unnecessary requires from app
Andy Allan [Wed, 6 Feb 2019 11:17:54 +0000 (12:17 +0100)]
Remove unnecessary requires from helpers
Andy Allan [Wed, 6 Feb 2019 11:11:44 +0000 (12:11 +0100)]
Move utf8 validator into app/validators
Andy Allan [Wed, 6 Feb 2019 10:44:34 +0000 (11:44 +0100)]
Remove unnecessary requires from tests
translatewiki.net [Mon, 4 Feb 2019 08:09:16 +0000 (09:09 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 31 Jan 2019 13:56:48 +0000 (13:56 +0000)]
Fix broken translation