1. 19 May, 2016 1 commit
    • Sean McGivern's avatar
      Chunk commits by date in lists · 37415e58
      Sean McGivern authored
      It's possible to construct a commit graph where the output of `git log`
      isn't in timestamp order. Grouping the commits in the list by date then
      gives dramatically wrong results. Instead, go for the more pragmatic
      approach: use the commits in the order they're given, and just show the
      date line each time the date changes. This means that the same date
      header can show up multiple times, but at least the ordering is
      preserved.
      37415e58
  2. 18 May, 2016 7 commits
    • Sean McGivern's avatar
      Maintain commit order in MRs · 27fdd3fe
      Sean McGivern authored
      `Gitlab::Git::Compare` will already have the correct order; sorting in
      Ruby can only ruin that. (The correct order being the same as `git log`
      - reverse chronological while maintaining the commit graph.)
      
      As an example, imagine a branch where someone has their system clock set
      wrong for some of the commits. Not only will those commits be in the
      wrong order - which is maybe reasonable - but sorting in Ruby can also
      put commits with the same timestamp out of order, as Ruby's sorting
      isn't stable.
      27fdd3fe
    • Rémy Coutable's avatar
      Merge branch 'remove-images-from-ci' into 'master' · 636b3ebb
      Rémy Coutable authored
      Clean up the images from GitLab CI
      
      Closes #17568
      
      See merge request !4163
      636b3ebb
    • Dmitriy Zaporozhets's avatar
      Merge branch 'remove-bottom-margin-for-flash-message-on-project-home-page' into 'master' · c5e3c797
      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
      c5e3c797
    • Rémy Coutable's avatar
      Fix 8.7.6 CHANGELOG · 3eacb197
      Rémy Coutable authored
      [ci skip]
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      3eacb197
    • Rémy Coutable's avatar
      Merge branch 'fix/import-data-issue' into 'master' · f4d2a2d9
      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
      f4d2a2d9
    • Rémy Coutable's avatar
      Merge branch 'issue_17302' into 'master' · da8ac163
      Rémy Coutable authored
      Fix api leaking notes when user is not authorized to read noteable
      
      fixes #17302
      
      See merge request !4102
      da8ac163
    • Felipe Artur's avatar
      5bf49bb6
  3. 17 May, 2016 4 commits
  4. 16 May, 2016 28 commits