Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !405 opened Jun 02, 2018 by Tuomas Riihimäki@tuomari

Add allergies to user preferences

Edited Aug 02, 2018
Request to merge user-preferences into master
Pipeline #67 passed
for 5f895d68.
Pipeline #67 passed with warnings
for 5f895d68.
Pipeline #67 skipped
for 5f895d68.
Pipeline #67 waiting for manual action
for 5f895d68.
Pipeline #67 canceled
for 5f895d68.
Pipeline #67 failed
for 5f895d68.
Pipeline #67 running
for 5f895d68.
Pipeline #67 pending
for 5f895d68.

Merged

  • The changes were merged into master.
  • The source branch has been removed.
  • Discussion 17
  • Commits 3
  • Pipelines 4
  • Changes 20
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/238/

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/238/

  • Tuomas Riihimäki @tuomari

    added 1 commit

    • 7de81159 - simplify user metadata printing.

    Compare with previous version

    Jun 02, 2018

    added 1 commit

    • 7de81159 - simplify user metadata printing.

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/241/

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/241/

  • Tuomas Riihimäki @tuomari

    added 3 commits

    • 14334dff - 1 commit from branch master
    • 50317c4b - Add allergies to user preferences
    • c5c331b7 - simplify user metadata printing.

    Compare with previous version

    Jun 02, 2018

    added 3 commits

    • 14334dff - 1 commit from branch master
    • 50317c4b - Add allergies to user preferences
    • c5c331b7 - simplify user metadata printing.

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/247/

  • Jenkins @jenkins commented Jun 02, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/247/

  • Jenkins @jenkins commented Jun 03, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/253/

  • Jenkins @jenkins commented Jun 03, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/253/

  • 0a87271d8c733ea04f940ff817f5f97a?s=80&d=identicon
    Anssi Kolehmainen
    @aketzu started a discussion on an outdated diff Jun 04, 2018
    Last updated by Tuomas Riihimäki Jun 04, 2018
    code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
    1726 1727 user.shirt.LadyXL = Ladyfit XL
    1727 user.shirt.LadyXS = Ladyfit XS
    1728 1728 user.shirt.LadyXXL = Ladyfit XXL
    1729 user.shirt.M = Unisex M
    1729 user.shirt.Lady3XL = Ladyfit 3XL
    1730 user.shirt.Lady4XL = Ladyfit 4XL
    1731 user.shirt.Lady5XL = Ladyfit 5XL
    1732
    1730 1733 user.shirt.S = Unisex S
    1734 user.shirt.M = Unisex M
    1735 user.shirt.L = Unisex L
    1731 1736 user.shirt.XL = Unisex XL
    1732 1737 user.shirt.XXL = Unisex XXL
    1733 user.shirt.XXXL = Unisex XXXL
    1738 user.shirt.3XL = Unisex 3XL
    1739 user.shirt.4XL = Unisex 3XL
    • Anssi Kolehmainen @aketzu commented Jun 04, 2018
      Developer

      4XL != 3XL

    • Tuomas Riihimäki @tuomari commented Jun 04, 2018
      Owner

      Hyvä löytö!

  • 0a87271d8c733ea04f940ff817f5f97a?s=80&d=identicon
    Anssi Kolehmainen
    @aketzu started a discussion on an outdated diff Jun 04, 2018
    code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
    1449 1450 user.shirt.LadyXL = Ladyfit XL
    1450 user.shirt.LadyXS = Ladyfit XS
    1451 1451 user.shirt.LadyXXL = Ladyfit XXL
    1452 user.shirt.M = Unisex M
    1452 user.shirt.Lady3XL = Ladyfit 3XL
    1453 user.shirt.Lady4XL = Ladyfit 4XL
    1454 user.shirt.Lady5XL = Ladyfit 5XL
    1455
    1453 1456 user.shirt.S = Unisex S
    1457 user.shirt.M = Unisex M
    1458 user.shirt.L = Unisex L
    1454 1459 user.shirt.XL = Unisex XL
    1455 1460 user.shirt.XXL = Unisex XXL
    1456 user.shirt.XXXL = Unisex XXXL
    1461 user.shirt.3XL = Unisex 3XL
    1462 user.shirt.4XL = Unisex 3XL
    • Anssi Kolehmainen @aketzu commented Jun 04, 2018
      Developer

      also here, 3XL != 4XL

  • Tuomas Riihimäki @tuomari

    added 3 commits

    • 12af1628 - Add allergies to user preferences
    • 7f5bb682 - simplify user metadata printing.
    • 5f895d68 - Fix error when saving empty t-shirt size

    Compare with previous version

    Jun 04, 2018

    added 3 commits

    • 12af1628 - Add allergies to user preferences
    • 7f5bb682 - simplify user metadata printing.
    • 5f895d68 - Fix error when saving empty t-shirt size

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jun 04, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Jun 04, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/256/

  • Jenkins @jenkins commented Jun 04, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/256/

  • Tuukka Kivilahti @tkfftk

    mentioned in commit ce205efe

    Aug 02, 2018

    mentioned in commit ce205efe

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    merged

    Aug 02, 2018

    merged

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Tuukka Kivilahti
Assignee
Tuukka Kivilahti @tkfftk
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
4
4 participants
Reference: codecrew/moya!405
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.