1. 18 May, 2016 5 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'remove-bottom-margin-for-flash-message-on-project-home-page' into 'master' · c28a98068cf8
      Dmitriy Zaporozhets authored
      Remove bottom margin for flash message on home page
      
      ### Flash Messages 
      Remove `margin-bottom: 16px` from `.no-ssh-key-message` and `.project-limit-message`. 
      This added an unnecessary margin between the notification and the content which was brought up in this issue #14797.
      
      ### Affected files:
          ./app/assets/javascripts/project.js.coffee:      $(@).parents('.no-ssh-key-message').remove()
          ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message {
          ./app/views/shared/_no_ssh.html.haml:  .no-ssh-key-message.alert.alert-warning.hidden-xs
          ./app/assets/javascripts/user.js.coffee:    $('.hide-project-limit-message').on 'click', (e) ->
          ./app/assets/javascripts/user.js.coffee:      $(@).parents('.project-limit-message').remove()
          ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message {
          ./app/views/shared/_project_limit.html.haml:  .project-limit-message.alert.alert-warning.hidden-xs
          ./app/views/shared/_project_limit.html.haml:      = link_to 'Remind later', '#', class: 'hide-project-limit-message alert-link'
      
      ### Screenshots:
      #### Before: 
      ![Screen_Shot_2016-05-16_at_11.45.17_PM](/uploads/35f9db16526830e49bc302e2d00ecf7e/Screen_Shot_2016-05-16_at_11.45.17_PM.png)
      
      #### After:
      ![Screen_Shot_2016-05-16_at_11.38.24_PM](/uploads/b8f9ac29b574a99c962c52028f7e61dd/Screen_Shot_2016-05-16_at_11.38.24_PM.png)
      
      
      See merge request !4173
      c28a98068cf8
    • Rémy Coutable's avatar
      Fix 8.7.6 CHANGELOG · 86bab0b457ba
      Rémy Coutable authored
      
      
      [ci skip]
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      86bab0b457ba
    • Rémy Coutable's avatar
      Merge branch 'fix/import-data-issue' into 'master' · 769402e5bf22
      Rémy Coutable authored
      Create import data in service and fix timing issues when scheduling job
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376
      
      See merge request !4106
      769402e5bf22
    • Rémy Coutable's avatar
      Merge branch 'issue_17302' into 'master' · 3759991a494a
      Rémy Coutable authored
      Fix api leaking notes when user is not authorized to read noteable
      
      fixes #17302
      
      See merge request !4102
      3759991a494a
    • Felipe Artur's avatar
      Move note helper method to notes entity file · e1c4f15b0f6a
      Felipe Artur authored
      e1c4f15b0f6a
  2. 17 May, 2016 4 commits
  3. 16 May, 2016 31 commits