]> git.openstreetmap.org Git - rails.git/log
rails.git
4 months agoMerge remote-tracking branch 'upstream/pull/4960'
Tom Hughes [Sun, 7 Jul 2024 09:45:39 +0000 (10:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4960'

4 months agoMerge remote-tracking branch 'upstream/pull/4959'
Tom Hughes [Sun, 7 Jul 2024 09:42:45 +0000 (10:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4959'

4 months agoMerge remote-tracking branch 'upstream/pull/4953'
Tom Hughes [Sun, 7 Jul 2024 09:26:27 +0000 (10:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4953'

4 months agoMerge remote-tracking branch 'upstream/pull/4952'
Tom Hughes [Sun, 7 Jul 2024 09:23:06 +0000 (10:23 +0100)]
Merge remote-tracking branch 'upstream/pull/4952'

4 months agoDon't call check_signup_allowed inside save_new_user
Anton Khorev [Sat, 6 Jul 2024 15:51:54 +0000 (18:51 +0300)]
Don't call check_signup_allowed inside save_new_user

4 months agoRemove "whereami" search parameter, use "lat" and "lon" instead
Anton Khorev [Sat, 6 Jul 2024 13:56:49 +0000 (16:56 +0300)]
Remove "whereami" search parameter, use "lat" and "lon" instead

4 months agoMerge branch 'pull/4793'
Anton Khorev [Sat, 6 Jul 2024 11:18:50 +0000 (14:18 +0300)]
Merge branch 'pull/4793'

4 months agoRestore previous position of signup background
Anton Khorev [Sat, 6 Jul 2024 11:17:58 +0000 (14:17 +0300)]
Restore previous position of signup background

The new image is cropped differently, resulting in a different background-position-x value.

4 months agoRemove padding around tabs on blocked signup page
Anton Khorev [Fri, 5 Jul 2024 10:55:02 +0000 (13:55 +0300)]
Remove padding around tabs on blocked signup page

4 months agoUse alt text in OpenID image alt attribute
Anton Khorev [Fri, 5 Jul 2024 09:36:02 +0000 (12:36 +0300)]
Use alt text in OpenID image alt attribute

4 months agoMerge remote-tracking branch 'upstream/pull/4949'
Tom Hughes [Thu, 4 Jul 2024 17:54:03 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4949'

4 months agoMerge remote-tracking branch 'upstream/pull/4945'
Tom Hughes [Thu, 4 Jul 2024 17:31:23 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4945'

4 months agoMerge remote-tracking branch 'upstream/pull/4943'
Tom Hughes [Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/4943'

4 months agoMerge remote-tracking branch 'upstream/pull/4942'
Tom Hughes [Thu, 4 Jul 2024 17:28:29 +0000 (18:28 +0100)]
Merge remote-tracking branch 'upstream/pull/4942'

4 months agoMerge remote-tracking branch 'upstream/pull/4941'
Tom Hughes [Thu, 4 Jul 2024 17:26:18 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4941'

4 months agoMerge branch 'pull/4935'
Anton Khorev [Thu, 4 Jul 2024 15:14:58 +0000 (18:14 +0300)]
Merge branch 'pull/4935'

4 months agoShare button unusable on a cell phone
nertc [Thu, 4 Jul 2024 12:17:56 +0000 (16:17 +0400)]
Share button unusable on a cell phone

4 months agoupdate styling
Emin Kocan [Thu, 4 Jul 2024 12:18:09 +0000 (14:18 +0200)]
update styling

Co-authored-by: Anton Khorev <tony29@yandex.ru>
4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jul 2024 12:16:42 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

4 months agorefactor password field to use form helpers
Emin Kocan [Mon, 1 Jul 2024 11:23:03 +0000 (13:23 +0200)]
refactor password field to use form helpers

4 months agoUse inline svg for new diary entry icon
Anton Khorev [Wed, 3 Jul 2024 12:14:11 +0000 (15:14 +0300)]
Use inline svg for new diary entry icon

4 months agoMove source images to assets directory
Anton Khorev [Wed, 3 Jul 2024 08:35:46 +0000 (11:35 +0300)]
Move source images to assets directory

4 months agoRemove unused gradients from note markers
Anton Khorev [Wed, 3 Jul 2024 08:13:09 +0000 (11:13 +0300)]
Remove unused gradients from note markers

4 months agoChange auth provider logo alt texts to indicate that these are logos
Anton Khorev [Wed, 3 Jul 2024 07:40:27 +0000 (10:40 +0300)]
Change auth provider logo alt texts to indicate that these are logos

4 months agoMerge remote-tracking branch 'upstream/pull/4938'
Tom Hughes [Tue, 2 Jul 2024 20:07:27 +0000 (21:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4938'

4 months agoKeep to strong_migrations 1.8 for ruby 3.0 compatibility
Tom Hughes [Tue, 2 Jul 2024 20:06:33 +0000 (21:06 +0100)]
Keep to strong_migrations 1.8 for ruby 3.0 compatibility

4 months agoAccept coordinates with a slash in search
nertc [Tue, 2 Jul 2024 10:17:23 +0000 (14:17 +0400)]
Accept coordinates with a slash in search

4 months agoMerge remote-tracking branch 'upstream/pull/4936'
Tom Hughes [Tue, 2 Jul 2024 17:28:06 +0000 (18:28 +0100)]
Merge remote-tracking branch 'upstream/pull/4936'

4 months agoMerge remote-tracking branch 'upstream/pull/4939'
Tom Hughes [Tue, 2 Jul 2024 17:19:09 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4939'

4 months agoMerge remote-tracking branch 'upstream/pull/4937'
Tom Hughes [Tue, 2 Jul 2024 17:17:08 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4937'

4 months agoUpdate bundle
Tom Hughes [Tue, 2 Jul 2024 17:06:27 +0000 (18:06 +0100)]
Update bundle

4 months agoRemove aol and wordpress auth provider locale strings
Anton Khorev [Tue, 2 Jul 2024 13:20:12 +0000 (16:20 +0300)]
Remove aol and wordpress auth provider locale strings

4 months agoBump qs from 6.12.1 to 6.12.2
dependabot[bot] [Mon, 1 Jul 2024 23:09:35 +0000 (23:09 +0000)]
Bump qs from 6.12.1 to 6.12.2

Bumps [qs](https://github.com/ljharb/qs) from 6.12.1 to 6.12.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.12.1...v6.12.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
4 months agoseparate translatable messages for privacy policy link in sign up form
Emin Kocan [Mon, 1 Jul 2024 16:35:43 +0000 (18:35 +0200)]
separate translatable messages for privacy policy link in sign up form

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jul 2024 12:16:34 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoMerge remote-tracking branch 'upstream/pull/4927'
Tom Hughes [Sun, 30 Jun 2024 09:28:02 +0000 (10:28 +0100)]
Merge remote-tracking branch 'upstream/pull/4927'

4 months agoMerge remote-tracking branch 'upstream/pull/4934'
Tom Hughes [Sun, 30 Jun 2024 09:08:40 +0000 (10:08 +0100)]
Merge remote-tracking branch 'upstream/pull/4934'

4 months agoMerge remote-tracking branch 'upstream/pull/4932'
Tom Hughes [Sun, 30 Jun 2024 09:01:00 +0000 (10:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4932'

4 months agoSet i18n locale before writing "report a problem" on embed page
Anton Khorev [Sun, 30 Jun 2024 01:51:43 +0000 (04:51 +0300)]
Set i18n locale before writing "report a problem" on embed page

4 months agoBump eslint from 9.5.0 to 9.6.0
dependabot[bot] [Fri, 28 Jun 2024 23:32:27 +0000 (23:32 +0000)]
Bump eslint from 9.5.0 to 9.6.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.5.0 to 9.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.5.0...v9.6.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
4 months agoOnly the sender of a message should be able to mark it as read/unread
Tom Hughes [Fri, 28 Jun 2024 23:14:42 +0000 (00:14 +0100)]
Only the sender of a message should be able to mark it as read/unread

4 months agoMerge remote-tracking branch 'upstream/pull/4928'
Tom Hughes [Thu, 27 Jun 2024 20:12:35 +0000 (21:12 +0100)]
Merge remote-tracking branch 'upstream/pull/4928'

4 months agolink event website after all
Mateusz Konieczny [Thu, 27 Jun 2024 20:01:13 +0000 (22:01 +0200)]
link event website after all

I got request from wzbartczak that - based on feedback - linking event page would be better after all

4 months agoMerge remote-tracking branch 'upstream/pull/4923'
Tom Hughes [Thu, 27 Jun 2024 17:52:10 +0000 (18:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4923'

4 months agoMerge remote-tracking branch 'upstream/pull/4916'
Tom Hughes [Thu, 27 Jun 2024 16:56:13 +0000 (17:56 +0100)]
Merge remote-tracking branch 'upstream/pull/4916'

4 months agoadd _section_divider component utilizing hr tags
Emin Kocan [Thu, 27 Jun 2024 15:22:41 +0000 (17:22 +0200)]
add _section_divider component utilizing hr tags

4 months agoUse SVG for OpenID icon on the login screen
Tom Hughes [Thu, 27 Jun 2024 16:51:32 +0000 (17:51 +0100)]
Use SVG for OpenID icon on the login screen

4 months agoMerge remote-tracking branch 'upstream/pull/4917'
Tom Hughes [Thu, 27 Jun 2024 16:47:16 +0000 (17:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4917'

4 months agoutilize button classes on preferred auth button
Emin Kocan [Thu, 27 Jun 2024 13:43:57 +0000 (15:43 +0200)]
utilize button classes on preferred auth button

4 months agostyle auth buttons using .btn & .btn-light classes
Emin Kocan [Fri, 21 Jun 2024 12:14:54 +0000 (14:14 +0200)]
style auth buttons using .btn & .btn-light classes

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Jun 2024 12:16:29 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoMerge pull request #4610 from AntonKhorev/no-old-note-api
Andy Allan [Wed, 26 Jun 2024 13:17:39 +0000 (14:17 +0100)]
Merge pull request #4610 from AntonKhorev/no-old-note-api

Remove old note api endpoints

4 months agoMerge pull request #4922 from tomhughes/geocoder-urls
Andy Allan [Wed, 26 Jun 2024 13:12:02 +0000 (14:12 +0100)]
Merge pull request #4922 from tomhughes/geocoder-urls

Simplify handling of geocoder URLs

4 months agoDrop compromised polyfill.io from upstream vendors
Tom Hughes [Wed, 26 Jun 2024 07:36:14 +0000 (08:36 +0100)]
Drop compromised polyfill.io from upstream vendors

4 months agoAdd entries for cowshed and sty to en.yml
Hufkratzer [Tue, 25 Jun 2024 22:11:06 +0000 (00:11 +0200)]
Add entries for cowshed and sty to en.yml

4 months agoSimplify handling of geocoder URLs
Tom Hughes [Tue, 25 Jun 2024 16:57:38 +0000 (17:57 +0100)]
Simplify handling of geocoder URLs

This avoids having to build them in multiple places and also
ensures we link to what was actually searched rather than some
random string from the locale file.

4 months agoMerge remote-tracking branch 'upstream/pull/4895'
Tom Hughes [Tue, 25 Jun 2024 16:42:52 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4895'

4 months agoMerge remote-tracking branch 'upstream/pull/4915'
Tom Hughes [Tue, 25 Jun 2024 16:35:26 +0000 (17:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4915'

4 months agoMerge remote-tracking branch 'upstream/pull/4921'
Tom Hughes [Tue, 25 Jun 2024 16:32:46 +0000 (17:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4921'

4 months agoUpdate bundle
Tom Hughes [Tue, 25 Jun 2024 16:21:32 +0000 (17:21 +0100)]
Update bundle

5 months agoMove reverse directions button to the right of from/to inputs
Anton Khorev [Tue, 25 Jun 2024 00:11:36 +0000 (03:11 +0300)]
Move reverse directions button to the right of from/to inputs

5 months agoMerge branch 'pull/4799'
Anton Khorev [Mon, 24 Jun 2024 15:35:55 +0000 (18:35 +0300)]
Merge branch 'pull/4799'

5 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Jun 2024 12:17:31 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

5 months agoDiscard fragments from wikimedia_commons tag values
Anton Khorev [Sat, 22 Jun 2024 18:48:42 +0000 (21:48 +0300)]
Discard fragments from wikimedia_commons tag values

5 months agoOSM icon to SVG
Hidde Wieringa [Fri, 21 Jun 2024 18:21:59 +0000 (20:21 +0200)]
OSM icon to SVG

whitespace

Revert og:image tags

Add original design OSM logo in assets/

Update _header.html.erb

5 months agoArrange button sizes to default size of 36px
Emin Kocan [Thu, 20 Jun 2024 19:18:32 +0000 (21:18 +0200)]
Arrange button sizes to default size of 36px

As discussed in #4773 there was not any clarification as why auth button sizes were reduced so 36px is now accepted as default. This commit addresses that comment/issue.

5 months agoUrl-encode wikimedia_commons tag values
Anton Khorev [Thu, 20 Jun 2024 19:13:28 +0000 (22:13 +0300)]
Url-encode wikimedia_commons tag values

5 months agoMerge remote-tracking branch 'upstream/pull/4913'
Tom Hughes [Wed, 19 Jun 2024 19:41:20 +0000 (20:41 +0100)]
Merge remote-tracking branch 'upstream/pull/4913'

5 months agoDisable Rails/BulkChangeTable cop
Andy Allan [Wed, 19 Jun 2024 16:44:20 +0000 (17:44 +0100)]
Disable Rails/BulkChangeTable cop

If you have multiple alter commands in a migration (like adding two
columns to an existing table) this cop will suggest combining them using
`change_table :foo, :bulk => true`.

However, Strong Migrations can't inspect `change_table` blocks, and
therefore suggests using `safety_assured`, which mostly defeats the
purpose of using strong_migrations in the first place.

Instead, we should stick with the individual alter commands. Since
postgres runs DDL changes in a transaction anyway, there is not enough
benefit from the `change_table` approach to be worth losing the
safety net of the Strong Migrations checks.

5 months agoMerge pull request #4813 from AntonKhorev/no-fst-italic
Andy Allan [Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)]
Merge pull request #4813 from AntonKhorev/no-fst-italic

Use font size instead of italic for changeset/trace descriptions

5 months agoMerge pull request #4884 from AntonKhorev/copyright-page-title
Andy Allan [Wed, 19 Jun 2024 14:26:21 +0000 (15:26 +0100)]
Merge pull request #4884 from AntonKhorev/copyright-page-title

Add title to copyright page

5 months agoMerge remote-tracking branch 'upstream/pull/4911'
Tom Hughes [Wed, 19 Jun 2024 14:17:24 +0000 (15:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4911'

5 months agoAdd Anton as a maintainer
Andy Allan [Wed, 19 Jun 2024 14:02:51 +0000 (15:02 +0100)]
Add Anton as a maintainer

5 months agoAdded link to nominatim results in searching results
Nenad Vujicic [Thu, 13 Jun 2024 16:06:31 +0000 (18:06 +0200)]
Added link to nominatim results in searching results

Fixes #3205. Added caching of nominatim URL query parameters in sources global variable (as parameters parameter) in GeocoderController#search for both direct and reverse geocoding. In app/views/geocoder/search.html.erb added displaying cached URL as forwarding link when clicked on "OpenStreetMap Nominatim" label. Updated GeocoderControllerTest to check only name (latlng, osm_nominatim, osm_nominatim_reverse) parameter of new sources variable.

5 months agoMerge pull request #4887 from AntonKhorev/full-encode-wikipedia-value
Andy Allan [Wed, 19 Jun 2024 13:41:38 +0000 (14:41 +0100)]
Merge pull request #4887 from AntonKhorev/full-encode-wikipedia-value

Fully encode wikipedia tag values

5 months agoMerge pull request #4909 from matkoniecz/patch-1
Andy Allan [Wed, 19 Jun 2024 12:54:22 +0000 (13:54 +0100)]
Merge pull request #4909 from matkoniecz/patch-1

start STOTMEU banner now

5 months agostart STOTMEU banner now
Mateusz Konieczny [Wed, 19 Jun 2024 10:34:36 +0000 (12:34 +0200)]
start STOTMEU banner now

note that start date was mandatory in initial per https://github.com/openstreetmap/openstreetmap-website/blob/master/FAQ.md#how-do-i-create-a-banner-to-promote-my-openstreetmap-event

> The pull request must indicate when the banner should start being shown, which must be at least 7 days after the pull request was created.

5 months agoMerge pull request #4906 from matkoniecz/sotmeu-banner
Andy Allan [Wed, 19 Jun 2024 09:32:49 +0000 (10:32 +0100)]
Merge pull request #4906 from matkoniecz/sotmeu-banner

SOTMEU 2024 banner

5 months agoMerge pull request #4908 from tomhughes/changeset-size-limit
Andy Allan [Wed, 19 Jun 2024 09:01:23 +0000 (10:01 +0100)]
Merge pull request #4908 from tomhughes/changeset-size-limit

Add the ability to limit changeset size

5 months agoAdd tests for API changeset size limits
Tom Hughes [Tue, 18 Jun 2024 23:41:30 +0000 (00:41 +0100)]
Add tests for API changeset size limits

5 months agoUpdate tests to avoid triggering changeset size limits
Tom Hughes [Tue, 18 Jun 2024 21:45:01 +0000 (22:45 +0100)]
Update tests to avoid triggering changeset size limits

5 months agoEnforce changeset size limit for API calls which make changes
Tom Hughes [Tue, 18 Jun 2024 19:45:00 +0000 (20:45 +0100)]
Enforce changeset size limit for API calls which make changes

5 months agoAdd support for per-user limits on the size of changes that can be made
Tom Hughes [Tue, 18 Jun 2024 19:35:09 +0000 (20:35 +0100)]
Add support for per-user limits on the size of changes that can be made

5 months agoUpdate bundle
Tom Hughes [Tue, 18 Jun 2024 17:15:41 +0000 (18:15 +0100)]
Update bundle

5 months agoMerge remote-tracking branch 'upstream/pull/4891'
Tom Hughes [Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4891'

5 months agoMerge remote-tracking branch 'upstream/pull/4905'
Tom Hughes [Mon, 17 Jun 2024 16:15:16 +0000 (17:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4905'

5 months agoMove diary comments hide/unhide actions to comments controller
Anton Khorev [Mon, 17 Jun 2024 15:10:32 +0000 (18:10 +0300)]
Move diary comments hide/unhide actions to comments controller

5 months agoSOTMEU 2024 banner
Mateusz Konieczny [Mon, 17 Jun 2024 13:38:26 +0000 (15:38 +0200)]
SOTMEU 2024 banner

5 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Jun 2024 12:16:52 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

5 months agoMerge remote-tracking branch 'upstream/pull/4902'
Tom Hughes [Sun, 16 Jun 2024 17:53:00 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4902'

5 months agoMerge remote-tracking branch 'upstream/pull/4899'
Tom Hughes [Sun, 16 Jun 2024 17:50:05 +0000 (18:50 +0100)]
Merge remote-tracking branch 'upstream/pull/4899'

5 months agoIntroduce geocode event callback for route endpoints
Anton Khorev [Sat, 15 Jun 2024 19:04:15 +0000 (22:04 +0300)]
Introduce geocode event callback for route endpoints

Removes remaining getRoute() call from endpoint objects.

5 months agoIntroduce drag event callback for route endpoints
Anton Khorev [Sat, 15 Jun 2024 18:51:48 +0000 (21:51 +0300)]
Introduce drag event callback for route endpoints

Avoids calling getRoute() from within endpoint objects.

5 months agoUse default og:image if Addressable::URI fails
Anton Khorev [Sat, 15 Jun 2024 12:57:10 +0000 (15:57 +0300)]
Use default og:image if Addressable::URI fails

5 months agoJoin and normalize og:image url using Addressable
Anton Khorev [Sat, 15 Jun 2024 12:03:22 +0000 (15:03 +0300)]
Join and normalize og:image url using Addressable

Avoids failing on urls that are not strictly rfc2396 URIs.

5 months agoBump eslint from 9.4.0 to 9.5.0
dependabot[bot] [Fri, 14 Jun 2024 23:12:34 +0000 (23:12 +0000)]
Bump eslint from 9.4.0 to 9.5.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.4.0 to 9.5.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.4.0...v9.5.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
5 months agoMerge remote-tracking branch 'upstream/pull/4897'
Tom Hughes [Fri, 14 Jun 2024 17:02:50 +0000 (18:02 +0100)]
Merge remote-tracking branch 'upstream/pull/4897'

5 months agoMerge remote-tracking branch 'upstream/pull/4896'
Tom Hughes [Fri, 14 Jun 2024 17:02:11 +0000 (18:02 +0100)]
Merge remote-tracking branch 'upstream/pull/4896'

5 months agoUse .is-invalid to highlight routing inputs with failed geocode lookups
Anton Khorev [Fri, 14 Jun 2024 16:42:45 +0000 (19:42 +0300)]
Use .is-invalid to highlight routing inputs with failed geocode lookups

5 months agoRemove global "awaiting geocode" routing state
Anton Khorev [Fri, 14 Jun 2024 16:14:49 +0000 (19:14 +0300)]
Remove global "awaiting geocode" routing state