1. 19 7月, 2016 38 次提交
  2. 18 7月, 2016 2 次提交
    • R
      Merge branch 'undo-revert-of-4892' into 'master' · 08264f43
      Rémy Coutable 提交于
      Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""
      
      ## What does this MR do?
      
      Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564.
      
      ## What are the relevant issue numbers?
      
      Closes #19872.
      
      See merge request !5310
      08264f43
    • J
      Merge branch 'master' into 'master' · a6e99ab1
      Jacob Schatz 提交于
      Fix activity heatmap to show proper day name.
      
      ## What does this MR do?
      This MR fixes issue #19909.
      
      ## Are there points in the code the reviewer needs to double check?
      Not necessarily, it's pretty straightforward, buuuut
      
      There was some discussion about whether GL wanted the activity heatmap to start on Monday or Sunday, this fix makes it start on Sunday, if GL is wanting it to start on Monday then some more substantial changes need to be made on the `calendar.js.coffee` script.
      
      ## Why was this MR needed?
      The amount of day names that were off from their dates was too damn high! :P 
      
      ## What are the relevant issue numbers?
      Directly #19909 
      
      Also some related discussion (feature discussion):
      #19282, #5988
      
      ## Screenshots (if relevant)
      **Currently on GL.com**
      ![Screen_Shot_2016-07-16_at_10.56.02_PM](/uploads/b45cfc56c29a8865a2bdc1f798409706/Screen_Shot_2016-07-16_at_10.56.02_PM.png)
      
      **After MR**
      ![Screen_Shot_2016-07-16_at_10.56.30_PM](/uploads/d8655bb259ced443a2c572ff03dcb8bb/Screen_Shot_2016-07-16_at_10.56.30_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5303
      a6e99ab1