Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
Venjob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Hoang Nam Nguyen
  • Venjob
  • Merge Requests
  • !4

Merged
Opened Sep 26, 2017 by Hoang Nam Nguyen@namnh 
  • Report abuse
Report abuse

WIP: Register page

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b register_page origin/register_page

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 register_page

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.

  • Discussion 4
  • Commits 5
  • Changes 83
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Hoang Nam Nguyen @namnh

    added 13 commits

    • 332760aa - crawled data from website
    • ad798cc6 - Delete jobs.csv
    • 3fdc0746 - Finish crawl and import data
    • 99d75d8a - Merge branch 'crawldata' of gitlab.zigexn.vn:namnh/Venjob into crawldata
    • 2cc5b542 - finish "top_page"
    • fbaa932a - 'Finished fix'
    • 1f28d7e7 - 'Finished fix'
    • c4db0830 - 'Finish cities_page industries_page'
    • 56be2f14 - 'Fix Top,industry,city_pages'
    • 785ef9b6 - 'Fix pages'
    • 91e3d553 - 'Fixed'
    • 4471d916 - 'finish search solr and fix bootstrap'
    • d0151290 - 'register_page'

    Compare with previous version

    Sep 26, 2017

    added 13 commits

    • 332760aa - crawled data from website
    • ad798cc6 - Delete jobs.csv
    • 3fdc0746 - Finish crawl and import data
    • 99d75d8a - Merge branch 'crawldata' of gitlab.zigexn.vn:namnh/Venjob into crawldata
    • 2cc5b542 - finish "top_page"
    • fbaa932a - 'Finished fix'
    • 1f28d7e7 - 'Finished fix'
    • c4db0830 - 'Finish cities_page industries_page'
    • 56be2f14 - 'Fix Top,industry,city_pages'
    • 785ef9b6 - 'Fix pages'
    • 91e3d553 - 'Fixed'
    • 4471d916 - 'finish search solr and fix bootstrap'
    • d0151290 - 'register_page'

    Compare with previous version

    added 13 commits * 332760aa - crawled data from website * ad798cc6 - Delete jobs.csv * 3fdc0746 - Finish crawl and import data * 99d75d8a - Merge branch 'crawldata' of gitlab.zigexn.vn:namnh/Venjob into crawldata * 2cc5b542 - finish "top_page" * fbaa932a - 'Finished fix' * 1f28d7e7 - 'Finished fix' * c4db0830 - 'Finish cities_page industries_page' * 56be2f14 - 'Fix Top,industry,city_pages' * 785ef9b6 - 'Fix pages' * 91e3d553 - 'Fixed' * 4471d916 - 'finish search solr and fix bootstrap' * d0151290 - 'register_page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/4/diffs?diff_id=3613&start_sha=cf42d00c5edda607f73a9cb022cbf576b0c5aee3)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    added 2 commits

    • bc3c4cb0 - 'add more bootstrap'
    • 2baa6eb2 - 'Fix register page'

    Compare with previous version

    Sep 27, 2017

    added 2 commits

    • bc3c4cb0 - 'add more bootstrap'
    • 2baa6eb2 - 'Fix register page'

    Compare with previous version

    added 2 commits * bc3c4cb0 - 'add more bootstrap' * 2baa6eb2 - 'Fix register page' [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/4/diffs?diff_id=3616&start_sha=d0151290f18eaa219370c25193c21e2a12a73e04)
    Toggle commit list
  • Vinh Nguyen
    @vinhnx started a discussion on the diff Sep 28, 2017
    app/sidekiq.log 0 → 100644
    1 # Logfile created on 2017-09-25 14:03:30 +0700 by logger.rb/56815
    • Vinh Nguyen @vinhnx commented Sep 28, 2017

      @namnh please don't commit log file.

      @namnh please don't commit log file.
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on the diff Sep 28, 2017
    Last updated by Hoang Nam Nguyen Sep 28, 2017
    app/controllers/users_controller.rb 0 → 100644
    1 class UsersController < ApplicationController
    2
    3 def new
    4 @user = User.new
    5 end
    6
    7 def create
    8 @user = User.new(email_params)
    9 @user.validate_name = false
    • Vinh Nguyen @vinhnx commented Sep 28, 2017

      @namnh why do we need to set validate_name = false?

      @namnh why do we need to set `validate_name = false`?
    • Hoang Nam Nguyen @namnh commented Sep 28, 2017
      Master

      because i required (:name, :email, :password password_confirmation, :cv) but when we confirm email we just need email field but it's require all . so we must use attr_accessor: validate_name = false, and we'll require limit

      because i required (:name, :email, :password password_confirmation, :cv) but when we confirm email we just need email field but it's require all . so we must use attr_accessor: validate_name = false, and we'll require limit
    Please register or sign in to reply
  • Vinh Nguyen
    @vinhnx started a discussion on the diff Sep 28, 2017
    app/views/job/detail.html.erb 0 → 100644
    6 <%= link_to 'CITY',cities_path , { class: 'btn btn-success' } %>
    7 <%= link_to 'INDUSTRY', industries_path, { class: 'btn btn-success' } %>
    8 <%= link_to 'SHORT TITLE', '#', { class: 'btn btn-success' } %>
    9 <%= link_to 'Apply','#', {class: 'btn btn-primary float-right'} %>
    10 </div>
    11 </div>
    12
    13 <div class="container">
    14 <div class="row mt-5">
    15 <div class="card text-center wt-100 ml-5">
    16 <div class="card-header success-color white-text">
    17 <h3 class="text-danger"><%= @job.job_title %></h3>
    18 </div>
    19 <div class="card-body">
    20 <h4 class="card-title text-primary"><%= @job.company.company_name %></h4>
    21 <p class="card-texts">Location: <%= @job.cities.map {|l| l.location}.join(',') %></p>
    • Vinh Nguyen @vinhnx commented Sep 28, 2017

      @namnh @jobs.cities.map(&:map)

      @namnh `@jobs.cities.map(&:map)`
    Please register or sign in to reply
  • Hoang Nam Nguyen @namnh

    added 1 commit

    • 90169376 - 'Finish register,login pages'

    Compare with previous version

    Sep 28, 2017

    added 1 commit

    • 90169376 - 'Finish register,login pages'

    Compare with previous version

    added 1 commit * 90169376 - &#x27;Finish register,login pages&#x27; [Compare with previous version](https://gitlab.zigexn.vn/namnh/Venjob/merge_requests/4/diffs?diff_id=3628&start_sha=2baa6eb240bee63c714b883825c6a013aa471253)
    Toggle commit list
  • Hoang Nam Nguyen @namnh

    merged

    Oct 02, 2017

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: namnh/Venjob!4