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 !389 opened Feb 04, 2018 by Tuukka Kivilahti@tkfftk

rest support for nfc tag logo android

Edited Apr 01, 2018
Request to merge tkfftk:nfcTagLogo into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.codecrew.fi/tkfftk/moya.git nfcTagLogo
git checkout -b tkfftk/moya-nfcTagLogo FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff tkfftk/moya-nfcTagLogo

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

  • The changes were merged into master.
  • Discussion 15
  • Commits 4
  • Changes 11
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Feb 05, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Feb 05, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/142/

  • Jenkins @jenkins commented Feb 05, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/142/

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff Feb 13, 2018
    code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/VipRestView.java
    25 25 import java.util.List;
    26 26
    27 27 @RequestScoped
    28 @Path("/v2/vip")
    • Tuomas Riihimäki @tuomari commented Feb 13, 2018
      Owner

      Eh.. Oliko tämä oikeasti tarkoitus tehdä näin?

  • Tuukka Kivilahti @tkfftk

    added 8 commits

    • c437d5c7...341df336 - 6 commits from branch codecrew:master
    • 48e39fee - hups :)
    • f2e1cd30 - Merge remote-tracking branch 'origin' into nfcTagLogo

    Compare with previous version

    Feb 17, 2018

    added 8 commits

    • c437d5c7...341df336 - 6 commits from branch codecrew:master
    • 48e39fee - hups :)
    • f2e1cd30 - Merge remote-tracking branch 'origin' into nfcTagLogo

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Feb 17, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Feb 17, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/148/

  • Jenkins @jenkins commented Feb 17, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/148/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/149/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/149/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/150/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/150/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/151/

  • Jenkins @jenkins commented Feb 18, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/151/

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff Feb 18, 2018
    code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/ProductRestView.java
    16 16 import io.swagger.annotations.Api;
    17 17
    18 18 @RequestScoped
    19 @Path("/v2/product")
    20 @Api(value = "/v2/product", description = "Product operations")
    19 @Path("/v3/product")
    20 @Api(value = "/v3/product", description = "Product operations")
    • Tuomas Riihimäki @tuomari commented Feb 18, 2018
      Owner

      Oliko tämänkin vahingossa vaihtunut v2->v3?

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff Mar 30, 2018
    code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ReaderBeanLocal.java
    30 30 @Local
    31 31 public interface ReaderBeanLocal {
    32 32
    33 // WAT!
    • Tuomas Riihimäki @tuomari commented Mar 30, 2018
      Owner

      Kyllä ny WAT pitää jättää.. Älä poista...

  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 45a74c6b - changes from comments

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 45a74c6b - changes from comments

    Compare with previous version

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    mentioned in commit b1f00ba6

    Apr 01, 2018

    mentioned in commit b1f00ba6

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    merged

    Apr 01, 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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!389
×

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.