Commit graph

9462 commits

Author SHA1 Message Date
translatewiki.net
8d3b0b79ef Localisation updates from https://translatewiki.net. 2019-03-14 13:14:50 +01:00
Andy Allan
25d89a63cb Remove application.yml step from travis config 2019-03-13 18:41:57 +01:00
Andy Allan
fd47078b14 Provide a helpful warning if there's an application.yml file detected 2019-03-13 18:20:08 +01:00
Andy Allan
7d57fb8c28 Add some settings validations 2019-03-13 18:06:23 +01:00
Andy Allan
e1cacdbe0e Update documentation for new approach to settings 2019-03-13 18:06:23 +01:00
Andy Allan
b3e74b0650 Instruct sprockets to recompile this file based on the settings files changing 2019-03-13 18:06:23 +01:00
Andy Allan
9af31c2254 Only take the STATUS configuration from the environment
This allows us to remove the preinitializer-based configuration parsing.
2019-03-13 18:06:23 +01:00
Andy Allan
5eef38a6b6 Drop the old environment variable parsing
It's likely unused, and incompatible with environment variable parsing from Config
2019-03-13 18:06:23 +01:00
Andy Allan
d102c9aaf4 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
2019-03-13 18:06:23 +01:00
Andy Allan
7b08270526 Install config gem for settings management 2019-03-13 18:06:23 +01:00
Andy Allan
1ca77d6dda Rubocop fixes for ruby 2.5 2019-03-13 10:33:33 +01:00
Andy Allan
f28e236bdd Upgrade minimum version of ruby to 2.5
This prepares the way for gems that depend on newer ruby, and also
prepares for the rails 6 upgrade.
2019-03-13 10:28:50 +01:00
translatewiki.net
e01a0e7124 Localisation updates from https://translatewiki.net. 2019-03-11 11:29:31 +01:00
Tom Hughes
7ccf6964e3 Prevent leading and trailing whitespace on email addresses 2019-03-08 11:17:51 +00:00
Tom Hughes
e174eb762f Strip leading and trailing whitespace for email authentication
Fixes #2173
2019-03-08 10:59:57 +00:00
translatewiki.net
b7834aa827 Localisation updates from https://translatewiki.net. 2019-03-07 16:23:12 +01:00
Tom Hughes
be0e33862f Merge remote-tracking branch 'upstream/pull/2167' 2019-03-06 17:23:46 +00:00
Andy Allan
2c21dd4906 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.
2019-03-06 09:54:05 +01:00
Richard Fairhurst
bd79c197cc
Update OS copyright year 2019-02-28 21:44:44 +00:00
Tom Hughes
94b59f4403 Merge remote-tracking branch 'upstream/pull/2161' 2019-02-28 19:17:40 +00:00
Tom Hughes
73214da35d Merge remote-tracking branch 'upstream/pull/2160' 2019-02-28 18:58:05 +00:00
Andy Allan
5f59845575 Move the api trace methods into a separate controller under the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
d7dd618d8f Fix test file name 2019-02-28 17:12:28 +01:00
Andy Allan
46bc4650d2 Move the amf and swf controllers into the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
b4dbf6233c Move the notes api methods into a controller in the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
4b4c5aac2f Move the user api methods into a separate controller in the api namespace 2019-02-28 17:12:28 +01:00
Andy Allan
b38343e5bd Move node/way/relation/old_* controllers into the api namespace 2019-02-28 17:12:28 +01:00
Quincy Morgan
4543e85441 Update to iD v2.14.3 2019-02-26 13:52:10 -05:00
Tom Hughes
4a902a701c Flip header image horizontally on RTL pages
Fixes #2158
2019-02-25 19:02:21 +00:00
Tom Hughes
2d4c548a9e Prevent reversal of sprite positions on welcome screen
Fixes #2156
2019-02-25 18:50:40 +00:00
Tom Hughes
d2ff1491b4 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
2019-02-25 11:46:12 +00:00
translatewiki.net
e5c5210896 Localisation updates from https://translatewiki.net. 2019-02-25 10:54:34 +01:00
Tom Hughes
89a4a9d59c Allow loading of our manifest 2019-02-24 22:40:01 +00:00
Andy Allan
9186a6155c Move the user preferences controller into the api namespace 2019-02-24 12:47:26 +01:00
Andy Allan
2b81437fcd Move the search controller to the api namespace 2019-02-24 12:42:07 +01:00
Andy Allan
947a41edee Move the api methods from changeset_comments_controller into the api namespaced controller 2019-02-24 12:38:09 +01:00
Andy Allan
1778fa3d9c Move the api methods from changesets_controller into the api namespaced controller 2019-02-24 12:18:31 +01:00
Andy Allan
f4e2990526 Move map method to its own controller 2019-02-24 11:44:10 +01:00
Andy Allan
d887252eeb Move the changes api to its own controller 2019-02-24 11:00:28 +01:00
Andy Allan
8383fd0928 Move the permissions call out of api_controller 2019-02-24 11:00:28 +01:00
Andy Allan
b96391e456 Rename api controller test files 2019-02-24 11:00:28 +01:00
Andy Allan
317b8f9d45 Move the trackpoints call into its own controller (and rename to tracepoints) 2019-02-24 11:00:28 +01:00
Andy Allan
6a4092bc16 Move the capabilities call out of api_controller 2019-02-24 11:00:20 +01:00
Tom Hughes
d74dd80540 Improve detection of browsers needing ES6 shims 2019-02-22 15:41:33 +00:00
Tom Hughes
cc3ac820cf Merge remote-tracking branch 'upstream/pull/2153' 2019-02-21 23:00:55 +00:00
Quincy Morgan
5e56dd7c48 Update to iD v2.14.2 2019-02-21 17:06:43 -05:00
Tom Hughes
f8a71ffb30 Merge remote-tracking branch 'upstream/pull/2152' 2019-02-20 23:57:50 +00:00
Quincy Morgan
f86bb781c9 Update to iD v2.14.1 2019-02-20 18:30:22 -05:00
Tom Hughes
73026e1615 Merge remote-tracking branch 'upstream/pull/2151' 2019-02-20 22:13:50 +00:00
Tom Hughes
a5735683e9 Avoid bundler 2.x for now
Fixes #2149
2019-02-20 21:46:21 +00:00