1. 13 Dec, 2016 7 commits
  2. 12 Dec, 2016 24 commits
  3. 11 Dec, 2016 5 commits
  4. 10 Dec, 2016 2 commits
  5. 09 Dec, 2016 2 commits
    • Alfredo Sumaran's avatar
      Merge branch '25324-change-housekeeping-btn-to-default' into 'master' · 3f768f9a
      Alfredo Sumaran authored
      Use default btn styling for Housekeeping button on projects settings page
      
      Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default```
      
      **BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png)
      
      **AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png)
      
      Closes #25324 
      cc: @awhildy
      
      See merge request !7959
      3f768f9a
    • Alfredo Sumaran's avatar
      Merge branch 'issue_24020' into 'master' · 3a66c239
      Alfredo Sumaran authored
      fix display hook error message
      
      ## What does this MR do?
      
      Fix hook error message display.  
      
      ## Are there points in the code the reviewer needs to double check?
      
      Probably Hook will return the plain multi line text.  It is better `pre` tag than `h4`.  
      I thought of another good looking display, but I did not come up with it. 😓 
      
      ## Why was this MR needed?
      
      When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error.  
      
      ## Screenshots (if relevant)
      
      When update hook returns an error like
      
      ```
      XXXXXXXX
      
      YYYYYYYY
      ZZZZZZZZ
      ```
      
      ![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png)
      
      ## What are the relevant issue numbers?
      
      Closes #24020
      
      See merge request !7775
      3a66c239