]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoMerge remote-tracking branch 'upstream/pull/2698'
Tom Hughes [Wed, 8 Jul 2020 18:10:01 +0000 (19:10 +0100)]
Merge remote-tracking branch 'upstream/pull/2698'

4 years agoMerge remote-tracking branch 'upstream/pull/2696'
Tom Hughes [Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2696'

4 years agoAllow image loading from tileserver.memomaps.de
Tom Hughes [Wed, 8 Jul 2020 18:07:49 +0000 (19:07 +0100)]
Allow image loading from tileserver.memomaps.de

4 years agoMerge remote-tracking branch 'upstream/pull/2670'
Tom Hughes [Wed, 8 Jul 2020 18:04:04 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/2670'

4 years agoMerge remote-tracking branch 'upstream/pull/2697'
Tom Hughes [Wed, 8 Jul 2020 17:57:32 +0000 (18:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2697'

4 years agoMerge remote-tracking branch 'upstream/pull/2700'
Tom Hughes [Wed, 8 Jul 2020 17:43:26 +0000 (18:43 +0100)]
Merge remote-tracking branch 'upstream/pull/2700'

4 years agoMerge remote-tracking branch 'upstream/pull/2699'
Tom Hughes [Wed, 8 Jul 2020 17:33:21 +0000 (18:33 +0100)]
Merge remote-tracking branch 'upstream/pull/2699'

4 years agoRemove unnecessary layout calls from api controllers
Andy Allan [Wed, 8 Jul 2020 16:51:27 +0000 (18:51 +0200)]
Remove unnecessary layout calls from api controllers

These were left over from the refactoring of the controllers into api and non-api versions.

4 years agoRename the notes#mine action to index
Andy Allan [Wed, 8 Jul 2020 16:43:30 +0000 (18:43 +0200)]
Rename the notes#mine action to index

4 years agoUse bootstrap text-muted in place of custom deemphasze class
Andy Allan [Wed, 8 Jul 2020 13:34:50 +0000 (15:34 +0200)]
Use bootstrap text-muted in place of custom deemphasze class

This avoids changing anything related to forms, since they will be
switched over to bootstrap separately.

4 years agoRemove some extraneous css
Andy Allan [Wed, 8 Jul 2020 14:57:49 +0000 (16:57 +0200)]
Remove some extraneous css

The trace part is actually removing html, but I thought it was CSS
when I first noticed the blank space on the page.

4 years agoRework the users#show page to avoid custom column css
Andy Allan [Wed, 8 Jul 2020 14:46:15 +0000 (16:46 +0200)]
Rework the users#show page to avoid custom column css

This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.

4 years agoFix new rubocop warnings
Tom Hughes [Tue, 7 Jul 2020 09:44:52 +0000 (10:44 +0100)]
Fix new rubocop warnings

4 years agoMerge remote-tracking branch 'upstream/pull/2693'
Tom Hughes [Tue, 7 Jul 2020 09:41:34 +0000 (10:41 +0100)]
Merge remote-tracking branch 'upstream/pull/2693'

4 years agoOnly report traces as offline when they are offline
Tom Hughes [Tue, 7 Jul 2020 09:37:56 +0000 (10:37 +0100)]
Only report traces as offline when they are offline

4 years agoRemove some debug logging comitted by mistake
Tom Hughes [Tue, 7 Jul 2020 09:37:39 +0000 (10:37 +0100)]
Remove some debug logging comitted by mistake

4 years agoBump rubocop-performance from 1.6.1 to 1.7.0
dependabot[bot] [Tue, 7 Jul 2020 05:02:03 +0000 (05:02 +0000)]
Bump rubocop-performance from 1.6.1 to 1.7.0

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.6.1...v1.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Jul 2020 16:51:54 +0000 (18:51 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2691'
Tom Hughes [Mon, 6 Jul 2020 07:33:51 +0000 (08:33 +0100)]
Merge remote-tracking branch 'upstream/pull/2691'

4 years agoBump eslint from 7.3.1 to 7.4.0
dependabot[bot] [Mon, 6 Jul 2020 05:01:13 +0000 (05:01 +0000)]
Bump eslint from 7.3.1 to 7.4.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.3.1 to 7.4.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.3.1...v7.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoFix errors with GPX offline mode
Tom Hughes [Sun, 5 Jul 2020 13:49:12 +0000 (14:49 +0100)]
Fix errors with GPX offline mode

4 years agoMerge remote-tracking branch 'upstream/pull/2689'
Tom Hughes [Sat, 4 Jul 2020 22:57:12 +0000 (23:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2689'

4 years agoRephrase the 'used_by' text on the about page.
Andy Allan [Sat, 4 Jul 2020 16:26:04 +0000 (18:26 +0200)]
Rephrase the 'used_by' text on the about page.

4 years agoMerge remote-tracking branch 'upstream/pull/2688'
Tom Hughes [Sat, 4 Jul 2020 09:39:07 +0000 (10:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2688'

4 years agoMerge remote-tracking branch 'upstream/pull/2687'
Tom Hughes [Sat, 4 Jul 2020 09:39:02 +0000 (10:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2687'

4 years agoMake the back button not look disabled
Andy Allan [Sat, 4 Jul 2020 09:20:46 +0000 (11:20 +0200)]
Make the back button not look disabled

This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386

4 years agoAvoid list markers for the richtext help text
Andy Allan [Sat, 4 Jul 2020 08:51:16 +0000 (10:51 +0200)]
Avoid list markers for the richtext help text

4 years agoMerge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0
Andy Allan [Sat, 4 Jul 2020 08:12:18 +0000 (10:12 +0200)]
Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0

Bump bootstrap from 4.3.1 to 4.5.0

4 years agoMerge remote-tracking branch 'upstream/pull/2685'
Tom Hughes [Fri, 3 Jul 2020 06:09:52 +0000 (07:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2685'

4 years agoBump aws-sdk-s3 from 1.72.0 to 1.73.0
dependabot[bot] [Fri, 3 Jul 2020 05:01:14 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.72.0 to 1.73.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Jul 2020 15:56:03 +0000 (17:56 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoBump bootstrap from 4.3.1 to 4.5.0
dependabot[bot] [Wed, 1 Jul 2020 15:58:13 +0000 (15:58 +0000)]
Bump bootstrap from 4.3.1 to 4.5.0

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.5.0.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoAdd banner for SOTM 2020
Martin Raifer [Wed, 1 Jul 2020 11:26:18 +0000 (12:26 +0100)]
Add banner for SOTM 2020

4 years agoMerge remote-tracking branch 'upstream/pull/2683'
Tom Hughes [Wed, 1 Jul 2020 07:28:18 +0000 (08:28 +0100)]
Merge remote-tracking branch 'upstream/pull/2683'

4 years agoMerge remote-tracking branch 'upstream/pull/2661'
Tom Hughes [Wed, 1 Jul 2020 07:28:08 +0000 (08:28 +0100)]
Merge remote-tracking branch 'upstream/pull/2661'

4 years agoBump json from 2.3.0 to 2.3.1
dependabot[bot] [Wed, 1 Jul 2020 05:01:35 +0000 (05:01 +0000)]
Bump json from 2.3.0 to 2.3.1

Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2680'
Tom Hughes [Tue, 30 Jun 2020 18:06:11 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/2680'

4 years agoBump i18n-js from 3.7.0 to 3.7.1
dependabot[bot] [Tue, 30 Jun 2020 05:01:08 +0000 (05:01 +0000)]
Bump i18n-js from 3.7.0 to 3.7.1

Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge pull request #2681 from rahulvaish/patch-1
Andy Allan [Mon, 29 Jun 2020 14:42:06 +0000 (16:42 +0200)]
Merge pull request #2681 from rahulvaish/patch-1

Updated README.md

4 years agoUpdated README.md
Rahul Vaish [Mon, 29 Jun 2020 14:39:52 +0000 (20:09 +0530)]
Updated README.md

Introduced Full Stops to maintain the consistency in the document.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Jun 2020 14:28:01 +0000 (16:28 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2679'
Tom Hughes [Mon, 29 Jun 2020 09:32:46 +0000 (10:32 +0100)]
Merge remote-tracking branch 'upstream/pull/2679'

4 years agoMerge remote-tracking branch 'upstream/pull/2678'
Tom Hughes [Mon, 29 Jun 2020 09:32:43 +0000 (10:32 +0100)]
Merge remote-tracking branch 'upstream/pull/2678'

4 years agoBump rails-i18n from 4.0.2 to 6.0.0
dependabot[bot] [Mon, 29 Jun 2020 05:01:53 +0000 (05:01 +0000)]
Bump rails-i18n from 4.0.2 to 6.0.0

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.71.1 to 1.72.0
dependabot[bot] [Mon, 29 Jun 2020 05:01:31 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.71.1 to 1.72.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.71.1 to 1.72.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump kramdown from 2.2.1 to 2.3.0
dependabot[bot] [Mon, 29 Jun 2020 05:01:11 +0000 (05:01 +0000)]
Bump kramdown from 2.2.1 to 2.3.0

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoRevert "Bump rails-i18n from 4.0.2 to 6.0.0"
Tom Hughes [Sun, 28 Jun 2020 18:21:24 +0000 (19:21 +0100)]
Revert "Bump rails-i18n from 4.0.2 to 6.0.0"

This reverts commit a6d8043dc25d213f9c6ee397f586ffd97a90c164.

4 years agoMerge remote-tracking branch 'upstream/pull/2676'
Tom Hughes [Sun, 28 Jun 2020 17:42:18 +0000 (18:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2676'

4 years agoEnable locale fallback in all environments
Tom Hughes [Fri, 26 Jun 2020 19:30:48 +0000 (20:30 +0100)]
Enable locale fallback in all environments

4 years agoBump rails-i18n from 4.0.2 to 6.0.0
dependabot[bot] [Fri, 26 Jun 2020 18:41:52 +0000 (18:41 +0000)]
Bump rails-i18n from 4.0.2 to 6.0.0

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoRequire open3 before using it
Tom Hughes [Fri, 26 Jun 2020 18:40:37 +0000 (19:40 +0100)]
Require open3 before using it

4 years agoMerge remote-tracking branch 'upstream/pull/2673'
Tom Hughes [Fri, 26 Jun 2020 18:32:42 +0000 (19:32 +0100)]
Merge remote-tracking branch 'upstream/pull/2673'

4 years agoBump puma from 3.12.6 to 4.3.5
dependabot[bot] [Fri, 26 Jun 2020 18:24:52 +0000 (18:24 +0000)]
Bump puma from 3.12.6 to 4.3.5

Bumps [puma](https://github.com/puma/puma) from 3.12.6 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump http_accept_language from 2.0.5 to 2.1.1
dependabot[bot] [Fri, 26 Jun 2020 18:24:22 +0000 (18:24 +0000)]
Bump http_accept_language from 2.0.5 to 2.1.1

Bumps [http_accept_language](https://github.com/iain/http_accept_language) from 2.0.5 to 2.1.1.
- [Release notes](https://github.com/iain/http_accept_language/releases)
- [Commits](https://github.com/iain/http_accept_language/compare/v2.0.5...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump eslint from 6.8.0 to 7.3.1
dependabot[bot] [Fri, 26 Jun 2020 18:24:19 +0000 (18:24 +0000)]
Bump eslint from 6.8.0 to 7.3.1

Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.3.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.8.0...v7.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoEnable dependabot
Tom Hughes [Fri, 26 Jun 2020 18:23:10 +0000 (19:23 +0100)]
Enable dependabot

4 years agoUpdate bundle
Tom Hughes [Fri, 26 Jun 2020 18:15:26 +0000 (19:15 +0100)]
Update bundle

4 years agoAdd ÖPNVKarte layer
Paul Norman [Fri, 26 Jun 2020 03:47:25 +0000 (20:47 -0700)]
Add Ã–PNVKarte layer

4 years agoUpdate leaflet-osm
Paul Norman [Fri, 26 Jun 2020 03:23:04 +0000 (20:23 -0700)]
Update leaflet-osm

4 years agoFix new rubocopy warnings
Tom Hughes [Wed, 24 Jun 2020 17:49:12 +0000 (18:49 +0100)]
Fix new rubocopy warnings

4 years agoUpdate bundle
Tom Hughes [Wed, 24 Jun 2020 17:46:28 +0000 (18:46 +0100)]
Update bundle

4 years agoDrop any pluralizable translations that are missing an "other" key
Tom Hughes [Sun, 21 Jun 2020 18:31:08 +0000 (19:31 +0100)]
Drop any pluralizable translations that are missing an "other" key

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jun 2020 15:29:19 +0000 (17:29 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoChange tile licence
Simon Poole [Sun, 21 Jun 2020 23:06:14 +0000 (01:06 +0200)]
Change tile licence

This changes the text describing the tile licence as per decision of the OSMF board starting July 1st 2020

4 years agoDrop any pluralizable translations that are missing an "other" key
Tom Hughes [Sun, 21 Jun 2020 18:31:08 +0000 (19:31 +0100)]
Drop any pluralizable translations that are missing an "other" key

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Jun 2020 19:24:54 +0000 (21:24 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate rails to 6.0.3.2
Tom Hughes [Wed, 17 Jun 2020 17:29:05 +0000 (18:29 +0100)]
Update rails to 6.0.3.2

4 years agoDrop any pluralizable translations that are missing an "other" key
Tom Hughes [Tue, 16 Jun 2020 23:03:45 +0000 (00:03 +0100)]
Drop any pluralizable translations that are missing an "other" key

4 years agoUpdate bundle
Tom Hughes [Tue, 16 Jun 2020 22:59:33 +0000 (23:59 +0100)]
Update bundle

Closes #2659

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jun 2020 20:21:49 +0000 (22:21 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoFix new erblint warnings
Tom Hughes [Thu, 11 Jun 2020 18:44:22 +0000 (19:44 +0100)]
Fix new erblint warnings

4 years agoFix new rubocop warnings
Tom Hughes [Thu, 11 Jun 2020 18:19:12 +0000 (19:19 +0100)]
Fix new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Thu, 11 Jun 2020 18:16:53 +0000 (19:16 +0100)]
Update bundle

4 years agoDrop any pluralizable translations that are missing an "other" key
Tom Hughes [Thu, 11 Jun 2020 18:15:56 +0000 (19:15 +0100)]
Drop any pluralizable translations that are missing an "other" key

4 years agoCheck that pluralizable translations have an "other" key
Tom Hughes [Thu, 11 Jun 2020 18:15:38 +0000 (19:15 +0100)]
Check that pluralizable translations have an "other" key

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jun 2020 17:30:37 +0000 (19:30 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoShow user delete links to admins
Tom Hughes [Thu, 11 Jun 2020 16:26:05 +0000 (17:26 +0100)]
Show user delete links to admins

4 years agoMerge remote-tracking branch 'upstream/pull/2651'
Tom Hughes [Wed, 10 Jun 2020 10:05:22 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/2651'

4 years agoRework user#set_status and #delete to avoid GET requests
Andy Allan [Wed, 10 Jun 2020 09:49:18 +0000 (11:49 +0200)]
Rework user#set_status and #delete to avoid GET requests

This renames the delete action to destroy, and starts using resourceful
routing for user actions.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Jun 2020 15:12:34 +0000 (17:12 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoRename `many` keys to `other` for the cs locale.
Tom Hughes [Sun, 7 Jun 2020 21:35:37 +0000 (22:35 +0100)]
Rename `many` keys to `other` for the cs locale.

Fixes #2645

4 years agoUpdate bundle
Tom Hughes [Sun, 7 Jun 2020 18:19:10 +0000 (19:19 +0100)]
Update bundle

4 years agoMore improvements to locale selection for the data browser
Tom Hughes [Sun, 7 Jun 2020 18:10:48 +0000 (19:10 +0100)]
More improvements to locale selection for the data browser

Use the browser language preferences for non-logged in users.

4 years agoMerge remote-tracking branch 'upstream/pull/2642'
Tom Hughes [Thu, 4 Jun 2020 16:40:13 +0000 (17:40 +0100)]
Merge remote-tracking branch 'upstream/pull/2642'

4 years agoImprove selection of name to display in data browser
Tom Hughes [Thu, 4 Jun 2020 16:25:13 +0000 (17:25 +0100)]
Improve selection of name to display in data browser

If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636

4 years agoImprove locale selection algorithm
Tom Hughes [Thu, 4 Jun 2020 16:23:16 +0000 (17:23 +0100)]
Improve locale selection algorithm

Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jun 2020 15:59:12 +0000 (17:59 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoFix new rubocop warnings
Tom Hughes [Wed, 3 Jun 2020 16:47:35 +0000 (17:47 +0100)]
Fix new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Wed, 3 Jun 2020 16:41:38 +0000 (17:41 +0100)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/2641'
Tom Hughes [Wed, 3 Jun 2020 16:31:12 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2641'

4 years agoRename friend to friendship in notifier
Andy Allan [Wed, 3 Jun 2020 16:29:08 +0000 (18:29 +0200)]
Rename friend to friendship in notifier

Followup to #2269

4 years agoMove make_friend and remove_friend to friendships controller
Andy Allan [Wed, 3 Jun 2020 16:23:07 +0000 (18:23 +0200)]
Move make_friend and remove_friend to friendships controller

4 years agoMerge remote-tracking branch 'upstream/pull/2639'
Tom Hughes [Wed, 3 Jun 2020 16:19:03 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2639'

4 years agoMerge remote-tracking branch 'upstream/pull/2638'
Tom Hughes [Wed, 3 Jun 2020 16:13:49 +0000 (17:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2638'

4 years agoMerge remote-tracking branch 'upstream/pull/2637'
Tom Hughes [Wed, 3 Jun 2020 16:09:07 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2637'

4 years agoMerge remote-tracking branch 'upstream/pull/2640'
Tom Hughes [Wed, 3 Jun 2020 16:07:31 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2640'

4 years agoMove friendship related tests to separate file
Andy Allan [Wed, 3 Jun 2020 15:51:11 +0000 (17:51 +0200)]
Move friendship related tests to separate file

4 years agoConvert lib files to model concerns
Andy Allan [Wed, 3 Jun 2020 14:44:26 +0000 (16:44 +0200)]
Convert lib files to model concerns

4 years agoRemove some unused scripts
Andy Allan [Wed, 3 Jun 2020 14:14:58 +0000 (16:14 +0200)]
Remove some unused scripts

4 years agoMerge pull request #2624 from francois2metz/diary-entry
Andy Allan [Wed, 3 Jun 2020 12:11:04 +0000 (14:11 +0200)]
Merge pull request #2624 from francois2metz/diary-entry

Add link to my diary in the diary index