]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 13 Sep 2017 15:19:16 +0000 (16:19 +0100)]
Create an IssueCommentsController for managing IssueComments
Andy Allan [Wed, 13 Sep 2017 15:16:33 +0000 (16:16 +0100)]
Fix parameter spacing
Andy Allan [Wed, 13 Sep 2017 15:12:36 +0000 (16:12 +0100)]
Rework the 'issues not found' notice slightly.
Previously it would go into a redirect loop if there were no issues
in the database.
Andy Allan [Wed, 13 Sep 2017 15:02:15 +0000 (16:02 +0100)]
The link is to the list of issues, not of reports, and there's no need for it to be bold.
Andy Allan [Wed, 13 Sep 2017 14:01:36 +0000 (15:01 +0100)]
Ensure that issue comments have associated issues and users.
Andy Allan [Wed, 13 Sep 2017 13:58:13 +0000 (14:58 +0100)]
Add missing structure.sql changes from
948fd8c8faf1016d
Andy Allan [Wed, 13 Sep 2017 13:35:49 +0000 (14:35 +0100)]
Remove created_at / updated_at column definitions since these duplicate t.timestamps
Kshitiz Khanal [Mon, 4 Sep 2017 07:05:26 +0000 (12:50 +0545)]
Add banner for State of the Map Asia 2017
Closes #1630
Wille Marcel [Fri, 8 Sep 2017 01:14:33 +0000 (22:14 -0300)]
Add padding between the last diary post and the pagination links
Closes #1634
Tom Hughes [Fri, 8 Sep 2017 15:49:28 +0000 (16:49 +0100)]
Update secure_headers configuration for upstream changes
Tom Hughes [Fri, 8 Sep 2017 14:38:25 +0000 (15:38 +0100)]
Update travis configuration to work on trusty based builders
Switch to postgres 9.5 and link postgres functions to a directory
that is accessible to the postgres server.
Tom Hughes [Fri, 8 Sep 2017 14:08:47 +0000 (15:08 +0100)]
Update rails to 5.0.6
Andy Allan [Wed, 6 Sep 2017 17:17:54 +0000 (18:17 +0100)]
Ensure report details are not blank.
Andy Allan [Wed, 6 Sep 2017 17:06:21 +0000 (18:06 +0100)]
Refactor creating a new report to use a ReportsController
It's really a report that the user is creating, the issue is created indirectly. Similar
refactoring will be required for issue comments.
Andy Allan [Wed, 6 Sep 2017 16:57:54 +0000 (17:57 +0100)]
Use reports_count so that counter_cache works automatically.
Andy Allan [Wed, 6 Sep 2017 15:27:54 +0000 (16:27 +0100)]
Remove the border around the radio boxes
It looks strange.
Andy Allan [Wed, 6 Sep 2017 10:31:21 +0000 (11:31 +0100)]
Check that the flag is not show when not logged in
Andy Allan [Wed, 6 Sep 2017 10:24:54 +0000 (11:24 +0100)]
Add a basic feature test for reporting diary entries.
Andy Allan [Wed, 6 Sep 2017 10:21:00 +0000 (11:21 +0100)]
Add minitest-rails-capybara
This allows us to write feature tests using capybara. These can be
easily changed to system tests when we upgrade to rails 5.1
Tom Hughes [Wed, 30 Aug 2017 20:09:32 +0000 (21:09 +0100)]
Merge remote-tracking branch 'upstream/pull/1614'
Andy Allan [Wed, 30 Aug 2017 10:40:54 +0000 (11:40 +0100)]
Rename xml processing methods with an update_ prefix
They behave differently from the other from_xml methods on other models.
Tom Hughes [Tue, 29 Aug 2017 19:28:06 +0000 (20:28 +0100)]
Enable retina tiles for Thunderforest layers
Fixes #1623
Bryan Housel [Sat, 26 Aug 2017 20:08:43 +0000 (16:08 -0400)]
Update to iD v2.4.1
Bryan Housel [Fri, 25 Aug 2017 20:24:19 +0000 (16:24 -0400)]
Add iD hashtags parameter
Bryan Housel [Fri, 25 Aug 2017 20:21:11 +0000 (16:21 -0400)]
Update to iD v2.4.0
Andy Allan [Fri, 18 Aug 2017 09:08:54 +0000 (10:08 +0100)]
Refactor the from_xml methods to act on existing trace objects.
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.
Fixes #1600
Andy Allan [Thu, 17 Aug 2017 18:03:50 +0000 (19:03 +0100)]
Add failing test demonstrating tag duplication when updating traces via the API.
Tom Hughes [Fri, 11 Aug 2017 16:45:57 +0000 (17:45 +0100)]
Make sure we show errors correctly when resetting a password
mmd-osm [Thu, 10 Aug 2017 18:49:50 +0000 (19:49 +0100)]
Discard empty ways from query result geometries
Fixes #1608
Tom Hughes [Wed, 9 Aug 2017 21:48:56 +0000 (22:48 +0100)]
Update to leaflet 1.2.0
Tom Hughes [Thu, 3 Aug 2017 18:08:54 +0000 (19:08 +0100)]
Fix rubocop warning
Tom Hughes [Thu, 3 Aug 2017 17:41:45 +0000 (18:41 +0100)]
Switch to using openstreetmap-deadlock_retry
Closes #1602
Tom Hughes [Wed, 2 Aug 2017 14:38:21 +0000 (15:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1604'
Andy Allan [Wed, 2 Aug 2017 14:34:17 +0000 (15:34 +0100)]
Add maintainers to README
It's nice to be explicit, so that new contributers know who is who.
While github shows "owner" and "member" labels these are for the
openstreetmap organisation as a whole, and can be misleading.
Tom Hughes [Wed, 2 Aug 2017 14:31:21 +0000 (15:31 +0100)]
Make sure the account form is POSTed
Fixes #1601
Andy Allan [Wed, 2 Aug 2017 14:15:25 +0000 (15:15 +0100)]
Merge pull request #1588 from Georeactor/master
Update gem, fix icons on RTL/Arabic pages
Tom Hughes [Wed, 2 Aug 2017 14:02:39 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/1603'
Andy Allan [Wed, 2 Aug 2017 13:58:03 +0000 (14:58 +0100)]
Avoid passing the current_user.id when commenting
Doing so doesn't appear to be necessary, and it opens up a spoofing
hole if it's actually used.
Andy Allan [Wed, 2 Aug 2017 13:48:04 +0000 (14:48 +0100)]
Remove unused user save template.
This template isn't used, since all the controller methods redirect
to other views.
Andy Allan [Wed, 2 Aug 2017 11:21:51 +0000 (12:21 +0100)]
Use current_user instead of @user.
Andy Allan [Wed, 2 Aug 2017 11:12:57 +0000 (12:12 +0100)]
Merge branch 'master' into moderation
Tom Hughes [Tue, 1 Aug 2017 18:23:41 +0000 (19:23 +0100)]
Fix user settings form
Fixes #1601
Tom Hughes [Mon, 31 Jul 2017 20:55:40 +0000 (21:55 +0100)]
Update to rails 5.0.5
Tom Hughes [Mon, 31 Jul 2017 20:55:32 +0000 (21:55 +0100)]
Update bundle
Tom Hughes [Mon, 31 Jul 2017 20:55:01 +0000 (21:55 +0100)]
Update rack-cors and fix tests for changes in behaviour
Andy Allan [Fri, 28 Jul 2017 11:42:33 +0000 (12:42 +0100)]
Merge pull request #1597 from tomhughes/current-user
Complete @user to current_user transition
Tom Hughes [Thu, 27 Jul 2017 18:44:14 +0000 (19:44 +0100)]
Replace @user with @current_user
This ensures that that we will find any more hidden references
to @user that might be hanging around...
Tom Hughes [Thu, 27 Jul 2017 18:40:20 +0000 (19:40 +0100)]
Change user forms to use current user instead of @user
Tom Hughes [Thu, 27 Jul 2017 18:27:17 +0000 (19:27 +0100)]
Convert @user to current_user in helpers
Tom Hughes [Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1595'
Andy Allan [Thu, 27 Jul 2017 09:31:31 +0000 (10:31 +0100)]
Convert @user to current_user
Andy Allan [Wed, 26 Jul 2017 10:54:31 +0000 (11:54 +0100)]
Use a current_user helper for accessing the logged in user in all views.
Andy Allan [Wed, 26 Jul 2017 09:58:04 +0000 (10:58 +0100)]
Convert remaining controller code to use current_user
The `self.current_user` is important when assigning to the current user,
to avoid creating a local variable called `current_user`
Nick Doiron [Mon, 17 Jul 2017 23:51:54 +0000 (13:51 -1000)]
use no-r2 comment to block RTL gem from changing sprites
Bryan Housel [Mon, 24 Jul 2017 22:55:40 +0000 (18:55 -0400)]
Update to iD v2.3.2
Christian Schmidt [Fri, 21 Jul 2017 18:29:07 +0000 (20:29 +0200)]
Update to Leaflet.Locate 0.62.0
Tom Hughes [Tue, 18 Jul 2017 23:31:03 +0000 (00:31 +0100)]
Mark account suspended flash message as HTML safe
Fixes #1590
Bryan Housel [Mon, 17 Jul 2017 18:03:12 +0000 (14:03 -0400)]
Clarify image dimensions
Tom Hughes [Mon, 17 Jul 2017 13:27:58 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1587'
Benoît [Mon, 17 Jul 2017 13:26:03 +0000 (15:26 +0200)]
new png file for banner with square 350x350
Benoît [Mon, 17 Jul 2017 11:35:41 +0000 (13:35 +0200)]
Delete sotmlatam-2016.jpg
Benoît [Mon, 17 Jul 2017 11:35:29 +0000 (13:35 +0200)]
Delete sotmasia-2016.jpg
Benoît [Mon, 17 Jul 2017 11:35:19 +0000 (13:35 +0200)]
Delete donate-2016.jpg
Benoît [Mon, 17 Jul 2017 11:34:48 +0000 (13:34 +0200)]
image with proper width 350px
Benoît [Mon, 17 Jul 2017 11:19:07 +0000 (13:19 +0200)]
remove old entries in banner.yml
Benoît [Mon, 17 Jul 2017 11:17:53 +0000 (13:17 +0200)]
add sotm2017 in banner.yml
Benoît [Mon, 17 Jul 2017 11:13:11 +0000 (13:13 +0200)]
add png file with background
Tom Hughes [Sun, 16 Jul 2017 17:35:45 +0000 (18:35 +0100)]
Add geoip_database key to example configuration
Fixes #1586
Tom Hughes [Wed, 12 Jul 2017 16:53:49 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1583'
Andy Allan [Wed, 12 Jul 2017 15:10:50 +0000 (16:10 +0100)]
Use current_user to represent the currently logged in user.
This is already used by the oauth plugin, and is a general rails convention.
Andy Allan [Wed, 12 Jul 2017 13:36:17 +0000 (14:36 +0100)]
Standardise on basic_authorization without the parentheses
Andy Allan [Wed, 12 Jul 2017 12:57:09 +0000 (13:57 +0100)]
Use rails 5 version of redirect_back.
Andy Allan [Wed, 12 Jul 2017 12:42:39 +0000 (13:42 +0100)]
Remove indirection.
Andy Allan [Wed, 12 Jul 2017 12:36:48 +0000 (13:36 +0100)]
Set the reported_user in a callback
This avoids passing around the reported_user via forms. There was no
validation anywhere that the reported_user corresponded to the object
being reported. This approach removes those worries too.
Andy Allan [Wed, 12 Jul 2017 10:49:23 +0000 (11:49 +0100)]
Rubocop autofixes.
Andy Allan [Wed, 12 Jul 2017 10:44:05 +0000 (11:44 +0100)]
Rename association to reported_user, for clarity
Andy Allan [Wed, 12 Jul 2017 10:38:50 +0000 (11:38 +0100)]
Get tests passing. Use factories instead of fixtures.
Andy Allan [Wed, 12 Jul 2017 09:16:11 +0000 (10:16 +0100)]
Merge branch 'master' into moderation
Bryan Housel [Tue, 11 Jul 2017 15:23:38 +0000 (11:23 -0400)]
Update to iD v2.3.1
Bryan Housel [Tue, 11 Jul 2017 04:58:19 +0000 (00:58 -0400)]
Add FAQ and information about creating a banner image
Tom Hughes [Mon, 10 Jul 2017 20:19:22 +0000 (21:19 +0100)]
Replace timecop with the rails builtin travel_to method
Bryan Housel [Fri, 7 Jul 2017 21:58:02 +0000 (17:58 -0400)]
Add iD walkthrough autostart parameter
Bryan Housel [Fri, 7 Jul 2017 21:35:03 +0000 (17:35 -0400)]
Update to iD v2.3.0
Tom Hughes [Thu, 6 Jul 2017 18:15:55 +0000 (19:15 +0100)]
Merge remote-tracking branch 'upstream/pull/1575'
Tom Hughes [Thu, 6 Jul 2017 18:11:21 +0000 (19:11 +0100)]
Add some tests for the user helper
Andy Allan [Wed, 5 Jul 2017 14:20:36 +0000 (15:20 +0100)]
Revert unrelated changes from db/structure.sql
Andy Allan [Wed, 5 Jul 2017 14:17:02 +0000 (15:17 +0100)]
Whitespace fixes.
Andy Allan [Wed, 5 Jul 2017 14:11:02 +0000 (15:11 +0100)]
Remove unused files
Andy Allan [Wed, 5 Jul 2017 14:06:57 +0000 (15:06 +0100)]
Revert changes to Vagrantfile
Andy Allan [Wed, 5 Jul 2017 11:39:52 +0000 (12:39 +0100)]
Hide contributor terms details, unless the user hasn't agreed
It's no longer important to show when users agreed to the contributor terms.
For users that haven't agreed, we still show their status on their profile.
Logic was also re-written to avoid lots of `if not` things, and tests added.
Tom Hughes [Fri, 30 Jun 2017 09:00:20 +0000 (10:00 +0100)]
Don't disable search submission buttons on form submission
Tom Hughes [Thu, 29 Jun 2017 19:52:57 +0000 (20:52 +0100)]
Fix more parameter sanitisation issues and add tests
Tom Hughes [Thu, 29 Jun 2017 18:14:55 +0000 (19:14 +0100)]
Disable forgery protection for notes API methods
Fixes #1571
Tom Hughes [Thu, 29 Jun 2017 09:55:53 +0000 (10:55 +0100)]
Sanitize parameters for various paged views
Tom Hughes [Thu, 29 Jun 2017 07:58:29 +0000 (08:58 +0100)]
Merge remote-tracking branch 'upstream/pull/1561'
Tom Hughes [Tue, 27 Jun 2017 18:22:03 +0000 (19:22 +0100)]
Update to leaflet 1.1.0
Tom Hughes [Tue, 6 Jun 2017 09:02:10 +0000 (10:02 +0100)]
Monkey patch oauth-plugin to avoid using deprecated methods
Tom Hughes [Fri, 2 Jun 2017 21:31:12 +0000 (22:31 +0100)]
Fix some tests for changes in rails 5
Tom Hughes [Mon, 5 Jun 2017 21:27:06 +0000 (22:27 +0100)]
Update get/post etc to remove use of deprecated syntax
Tom Hughes [Thu, 1 Jun 2017 21:41:39 +0000 (22:41 +0100)]
Update to rails 5.0.4