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 !262 opened Mar 29, 2015 by Juho Juopperi@jkj

User management via REST API

Getting users, checking password and resetting password. Used by Vectorama flow.

Edited Mar 29, 2015
Request to merge jkj:feature/rest-user-creation 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/jkj/moya.git feature/rest-user-creation
git checkout -b jkj/moya-feature/rest-user-creation 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 jkj/moya-feature/rest-user-creation

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 1
  • Commits 5
  • Changes 7
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on the diff Mar 29, 2015
    code/moya-web/src/main/java/fi/codecrew/moya/rest/UserRestView.java
    256 268 else
    257 269 return new EventUserRestPojo();
    258 270 }
    271
    272 @POST
    273 @Path("/create")
    274 @Produces({ MediaType.APPLICATION_JSON })
    275 @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
    276 @ApiOperation(value = "Create user", response = EventUserRestPojo.class)
    277 public EventUserRestPojo createEventUser() {
    278 return null;
    • Tuukka Kivilahti @tkfftk commented Mar 29, 2015
      Owner

      TODO?

  • Tuukka Kivilahti @tkfftk

    Status changed to merged

    Mar 29, 2015

    Status changed to merged

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    mentioned in commit 1732b012

    Mar 29, 2015

    mentioned in commit 1732b012

    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
2
2 participants
Reference: codecrew/moya!262