ID15 - ID14 - ID16
Create Register email ID15/ Register Email Finish ID14/ User information form ID16
×
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b id15-id14-id16 origin/id15-id14-id16
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 id15-id14-id16
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.
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-
Tô Ngọc Ánh @anhtn
added 1 commit
- ebb6e06f - Add devise, carriewave to create user sign up page
added 1 commit
- ebb6e06f - Add devise, carriewave to create user sign up page
added 1 commit * ebb6e06f - Add devise, carriewave to create user sign up page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=4980&start_sha=8144d97e69d5cd1df8ff6c16dcf861e83acd2e7a)Toggle commit list -
Tô Ngọc Ánh @anhtn
added 1 commit
- 1a181a6c - edit gitinore
added 1 commit * 1a181a6c - edit gitinore [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=4981&start_sha=ebb6e06f1677de2f4f2c139b93cdbc6d11685f99)Toggle commit list -
Tô Ngọc Ánh @anhtn
added 1 commit
- 77d96b2b - id11 id13
added 1 commit * 77d96b2b - id11 id13 [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5044&start_sha=1a181a6cadfc6a5315a21f93274dba0a1bfb228e)Toggle commit list -
Tô Ngọc Ánh @anhtn
added 1 commit
- 60d79e42 - remove wrong args in job page
added 1 commit * 60d79e42 - remove wrong args in job page [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5046&start_sha=77d96b2bb1f53afd6f133cfb2381f5f5cf0a1524)Toggle commit list -
app/views/users/_user.html.erb 0 → 1006442 <div class="card my-3"> 3 <div class="row no-gutters"> 4 <div class="col-md-4"> 5 <div class="card-img-rounded mx-auto"> 6 <%= image_tag 'venjob-logo.png', class: 'card-img' %> 7 </div> 8 </div> 9 <div class="col-md-8"> 10 <div class="card-body"> 11 <p class="card-title font-weight-bold text-center my-2 color-success display-4">Profile</p> 12 <p class="card-text"><strong>Email:</strong> <%= user.email %></p> 13 <p class="card-text"><strong>Full Name:</strong> <%= user.full_name %></p> 14 <p class="card-text"><strong>Curriculum Vitae:</strong> 15 <% if user.curriculum_vitae.present? %> 16 <%= link_to user.curriculum_vitae.identifier, user.curriculum_vitae.url, download: user.curriculum_vitae.identifier %> 17 <%= link_to '<i class="fas fa-eye"></i>'.html_safe, user.curriculum_vitae.url, target: '_blank', class: 'text-dark' %> -
Thanh Hung Pham @hungpt commentedMasterEdited by Thanh Hung Pham
@anhtn Nên hiển thị như vậy dễ nhìn hơn em.
<%= link_to user.curriculum_vitae.url, target: '_blank', class: 'text-dark' do %> <i class="fas fa-eye"></i> <% end %>@anhtn Nên hiển thị như vậy dễ nhìn hơn em. ``` <%= link_to user.curriculum_vitae.url, target: '_blank', class: 'text-dark' do %> <i class="fas fa-eye"></i> <% end %> ``` -
Tô Ngọc Ánh @anhtn
changed this line in version 6 of the diff
changed this line in version 6 of the diff
changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b#548e615f123e03babcfd51ac655a28c7ae9a17f3_17_16)Toggle commit list
Please register or sign in to reply -
-
app/views/users/_user.html.erb 0 → 100644
1 <div class="col-lg-8 col-md-12 mx-auto"> 2 <div class="card my-3"> 3 <div class="row no-gutters"> 4 <div class="col-md-4"> 5 <div class="card-img-rounded mx-auto"> 6 <%= image_tag 'venjob-logo.png', class: 'card-img' %> 7 </div> 8 </div> 9 <div class="col-md-8"> 10 <div class="card-body"> 11 <p class="card-title font-weight-bold text-center my-2 color-success display-4">Profile</p> 12 <p class="card-text"><strong>Email:</strong> <%= user.email %></p> 13 <p class="card-text"><strong>Full Name:</strong> <%= user.full_name %></p> 14 <p class="card-text"><strong>Curriculum Vitae:</strong> 15 <% if user.curriculum_vitae.present? %> 16 <%= link_to user.curriculum_vitae.identifier, user.curriculum_vitae.url, download: user.curriculum_vitae.identifier %> -
Thanh Hung Pham @hungpt commentedMaster
-
Tô Ngọc Ánh @anhtn
changed this line in version 6 of the diff
changed this line in version 6 of the diff
changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b#548e615f123e03babcfd51ac655a28c7ae9a17f3_16_16)Toggle commit list
-
-
app/views/users/_user.html.erb 0 → 100644
9 <div class="col-md-8"> 10 <div class="card-body"> 11 <p class="card-title font-weight-bold text-center my-2 color-success display-4">Profile</p> 12 <p class="card-text"><strong>Email:</strong> <%= user.email %></p> 13 <p class="card-text"><strong>Full Name:</strong> <%= user.full_name %></p> 14 <p class="card-text"><strong>Curriculum Vitae:</strong> 15 <% if user.curriculum_vitae.present? %> 16 <%= link_to user.curriculum_vitae.identifier, user.curriculum_vitae.url, download: user.curriculum_vitae.identifier %> 17 <%= link_to '<i class="fas fa-eye"></i>'.html_safe, user.curriculum_vitae.url, target: '_blank', class: 'text-dark' %> 18 <% else %> 19 You don't have any curriculum vitae 20 <% end %> 21 </p> 22 <p class="card-text"> 23 <% if is_current_user?(user) %> 24 <div class="row"> -
Thanh Hung Pham @hungpt commentedMaster
-
Tô Ngọc Ánh @anhtn
changed this line in version 6 of the diff
changed this line in version 6 of the diff
changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b#548e615f123e03babcfd51ac655a28c7ae9a17f3_24_24)Toggle commit list
-
-
8 8 9 9 <div class='collapse navbar-collapse' id='navbarSupportedContent'> 10 10 <ul class='navbar-nav ml-auto'> 11 <li class='nav-item active'> 12 <%= link_to 'Sign in', '#', class: 'nav-link text-white' %> 13 </li> 14 <li class='nav-item'> 15 <%= link_to 'Sign up', '#', class: 'nav-link text-white' %> 16 </li> 11 <% if user_signed_in? %> 12 <li class="nav-item"> 13 <%= link_to '<i class="fas fa-heart"></i>'.html_safe, '#', class: 'nav-link text-white', title: 'Favorite' %> -
Thanh Hung Pham @hungpt commentedMasterEdited
@anhtn Nên hiển thị như vậy dễ nhìn hơn em
<%= link_to '#', class: 'nav-link text-white', title: 'Favorite' do %> <i class="fas fa-heart"></i> <% end %>@anhtn Nên hiển thị như vậy dễ nhìn hơn em ``` <%= link_to '#', class: 'nav-link text-white', title: 'Favorite' do %> <i class="fas fa-heart"></i> <% end %> ``` -
Tô Ngọc Ánh @anhtn
changed this line in version 6 of the diff
changed this line in version 6 of the diff
changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b#76d1a11ee1e940c5ee3f38422c24188edb0fe433_13_13)Toggle commit list
-
-
8 8 9 9 <div class='collapse navbar-collapse' id='navbarSupportedContent'> 10 10 <ul class='navbar-nav ml-auto'> 11 <li class='nav-item active'> 12 <%= link_to 'Sign in', '#', class: 'nav-link text-white' %> 13 </li> 14 <li class='nav-item'> 15 <%= link_to 'Sign up', '#', class: 'nav-link text-white' %> 16 </li> 11 <% if user_signed_in? %> 12 <li class="nav-item"> 13 <%= link_to '<i class="fas fa-heart"></i>'.html_safe, '#', class: 'nav-link text-white', title: 'Favorite' %> 14 </li> 15 <li class="nav-item"> 16 <%= link_to '<i class="fas fa-history"></i>'.html_safe, '#', class: 'nav-link text-white', title: 'History' %> -
Thanh Hung Pham @hungpt commentedMasterEdited
@anhtn Nên hiển thị như vậy dễ nhìn hơn em
<%= link_to '#', class: 'nav-link text-white', title: 'History' do %> <i class="fas fa-history"></i> <% end %>@anhtn Nên hiển thị như vậy dễ nhìn hơn em ``` <%= link_to '#', class: 'nav-link text-white', title: 'History' do %> <i class="fas fa-history"></i> <% end %> ``` -
Tô Ngọc Ánh @anhtn
changed this line in version 6 of the diff
changed this line in version 6 of the diff
changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b#76d1a11ee1e940c5ee3f38422c24188edb0fe433_16_18)Toggle commit list
-
-
app/views/devise/shared/_links.html.erb 0 → 100644
1 <div class="text-center"> 2 <%- if controller_name != 'sessions' %> 3 <%= link_to "Log in", new_session_path(resource_name) %><br /> -
Thanh Hung Pham @hungpt commentedMasterEdited
@anhtn Chỉnh lại css mấy button của devise cho đồng nhất với page nha em
@anhtn Chỉnh lại css mấy button của devise cho đồng nhất với page nha em -
Tô Ngọc Ánh @anhtn commentedMaster
mấy này là link dẫn tới trang thôi chứ k phải button có tác dụng submit nên e để v nhìn nó đẹp hơn á a, chỉnh button hết thì nó xấu
mấy này là link dẫn tới trang thôi chứ k phải button có tác dụng submit nên e để v nhìn nó đẹp hơn á a, chỉnh button hết thì nó xấu
-
-
Tô Ngọc Ánh @anhtn
added 3 commits
added 3 commits
added 3 commits * cf113baf - Indentation * c8741169 - Config mailcatcher in development * 0590445c - config mail in production (herokuapp) [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5049&start_sha=60d79e42fa46c6917312cf54ab9e3b46c1d5b58b)Toggle commit list -
Tô Ngọc Ánh @anhtn
added 1 commit
- fb586918 - redirect my_page after update users
added 1 commit * fb586918 - redirect my_page after update users [Compare with previous version](https://gitlab.zigexn.vn/anhtn/VeNJob/merge_requests/11/diffs?diff_id=5050&start_sha=0590445ce5e044611a1ccdbfedc324f3a4716b44)Toggle commit list -
Tô Ngọc Ánh @anhtn
resolved all discussions
resolved all discussions
resolved all discussionsToggle commit list -
Tô Ngọc Ánh @anhtn
mentioned in commit 803abcc4
mentioned in commit 803abcc4
mentioned in commit 803abcc40400a1ed0d4b87b00dd17e8dd743ad91Toggle commit list -
Tô Ngọc Ánh @anhtn
merged
merged
mergedToggle commit list
×
Revert this merge request
×