Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
sample_app
  • 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 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Nguyen Hoang Mai Phuong
  • sample_app
  • Merge Requests
  • !9

Merged
Opened Jun 15, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

Use SSL and the Puma webserver in production

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b sign-up origin/sign-up

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 sign-up

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 9
  • Commits 1
  • Pipelines 1
  • Changes 10
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 15, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 16, 2021
    app/assets/stylesheets/custom.scss
    77 @include box_sizing;
    78 }
    79
    80 /* sidebar */
    81 aside {
    82 section.user_info {
    83 margin-top: 20px;
    84 }
    85 section {
    86 padding: 10px 0;
    87 margin-top: 20px;
    88 &:first-child {
    89 border: 0;
    90 padding-top: 0;
    91 }
    92 span {
    • Thanh Hung Pham @hungpt commented Jun 15, 2021
      Master

      @phuongnhm format lại chỗ nhà nha em. Dư space.

      @phuongnhm format lại chỗ nhà nha em. Dư space.
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 15, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 15, 2021
    app/assets/stylesheets/custom.scss
    82 section.user_info {
    83 margin-top: 20px;
    84 }
    85 section {
    86 padding: 10px 0;
    87 margin-top: 20px;
    88 &:first-child {
    89 border: 0;
    90 padding-top: 0;
    91 }
    92 span {
    93 display: block;
    94 margin-bottom: 3px;
    95 line-height: 1;
    96 }
    97 h1 {
    • Thanh Hung Pham @hungpt commented Jun 15, 2021
      Master

      @phuongnhm Tương tự chỗ này cũng dư space

      @phuongnhm Tương tự chỗ này cũng dư space
    • Nguyen Hoang Mai Phuong @phuongnhm commented Jun 15, 2021
      Master

      Này em là theo SASS kiểu nesting á anh. Em xem nhưng vẫn hem biết dư chỗ nào hic

      Này em là theo SASS kiểu nesting á anh. Em xem nhưng vẫn hem biết dư chỗ nào hic
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 15, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 15, 2021
    app/views/users/show.html.erb 0 → 100644
    1 <% provide(:title, @user.name) %>
    2 <div class="row">
    • Thanh Hung Pham @hungpt commented Jun 15, 2021
      Master

      @phuongnhm Format lại chỗ này, dư space từ L2-L11

      @phuongnhm Format lại chỗ này, dư space từ L2-L11
    • Nguyen Hoang Mai Phuong @phuongnhm commented Jun 15, 2021
      Master

      đã fix ạ

      đã fix ạ
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 15, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 15, 2021
    config/environments/development.rb
    73 73
    74 74 # Uncomment if you wish to allow Action Cable access from any origin.
    75 75 # config.action_cable.disable_request_forgery_protection = true
    76
    77 # Force all access to the app over SSL, use Strict-Transport-Security,
    78 # and use secure cookies.
    79 config.force_ssl = true
    • Thanh Hung Pham @hungpt commented Jun 15, 2021
      Master

      @phuongnhm Sao để config này ở development ?

      @phuongnhm Sao để config này ở `development` ?
    • Nguyen Hoang Mai Phuong @phuongnhm commented Jun 15, 2021
      Master

      Em làm theo hưỡng dẫn trong sách á anh page 423 424

      Em làm theo hưỡng dẫn trong sách á anh page 423 424
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jun 15, 2021
    Resolved by Nguyen Hoang Mai Phuong Jun 15, 2021
    app/assets/stylesheets/custom.scss
    70
    71 /* miscellaneous */
    72 .debug_dump {
    73 clear: both;
    74 float: left;
    75 width: 100%;
    76 margin-top: 45px;
    77 @include box_sizing;
    78 }
    79
    80 /* sidebar */
    81 aside {
    82 section.user_info {
    83 margin-top: 20px;
    84 }
    85 section {
    • Thanh Hung Pham @hungpt commented Jun 15, 2021
      Master

      @phuongnhm Mỗi phần css cách ra 1 line cho dễ nhìn em. Tương tự mấy chỗ khác

      @phuongnhm Mỗi phần css cách ra 1 line cho dễ nhìn em. Tương tự mấy chỗ khác
    • Nguyen Hoang Mai Phuong @phuongnhm commented Jun 15, 2021
      Master

      Cách chỗ nào anh em chưa hiểu lắm hic

      Cách chỗ nào anh em chưa hiểu lắm hic
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    mentioned in commit 952a378c

    Jun 16, 2021

    mentioned in commit 952a378c

    mentioned in commit 952a378ca72225b157dff19f8504c1cd45f65b9e
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    merged

    Jun 16, 2021

    merged

    merged
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    resolved all discussions

    Jun 16, 2021

    resolved all discussions

    resolved all discussions
    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: phuongnhm/sample_app!9
×

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.