1. 19 Sep, 2016 13 commits
  2. 18 Sep, 2016 12 commits
  3. 17 Sep, 2016 3 commits
  4. 16 Sep, 2016 12 commits
    • Jacob Schatz's avatar
      Merge branch 'scrolling-tabs-center-mobile' into 'master' · 35bed03c
      Jacob Schatz authored
      Scrolls active tab into middle of nav on mobile
      
      ## What does this MR do?
      
      On mobile (or smaller screens) it scrolls the currently active tab into the middle of the nav.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-09-15_at_09.38.55](/uploads/4170271b53b9509a385fa7844fb3dc78/Screen_Shot_2016-09-15_at_09.38.55.png)
      
      See merge request !6363
      35bed03c
    • Jacob Schatz's avatar
      Merge branch 'issue-boards-css-simplify' into 'master' · 1c8f00c9
      Jacob Schatz authored
      Simplified the CSS for issue boards
      
      ## What does this MR do?
      
      It gained a lot of extra cruft through the different improvements etc. This removes a lot of the stuff which would hopefully also speed up the browser rendering.
      
      - Removed flexbox from a lot of things which in turn reduces it's complexity.
      - Removed styles that either aren't used or aren't needed.
      - Various other improvements to the CSS.
      
      Basically just improved the CSS by removing overly complex CSS. There are no visible changes to issue boards, just less CSS for the same results.
      
      See merge request !6352
      1c8f00c9
    • Jacob Schatz's avatar
      Merge branch 'search-commit-ui-fix' into 'master' · 5fa3aeb0
      Jacob Schatz authored
      Fixed commit search UI
      
      ## What does this MR do?
      
      Fixes the UI for commits in search.
      
      If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png)
      
      ## What are the relevant issue numbers?
      
      Closes #21868
      
      See merge request !6205
      5fa3aeb0
    • Jacob Schatz's avatar
      Merge branch 'fix-anchor-icon' into 'master' · fe3692ac
      Jacob Schatz authored
      Fix anchor icon regression
      
      An error in scss prevented the markdown header `:hover` anchor icon svg from linking correctly:
      
      ![Screen_Shot_2016-09-14_at_4.06.19_PM](/uploads/f4d31a17a58bd7cbde572f91c316dfe1/Screen_Shot_2016-09-14_at_4.06.19_PM.png)
      
      The following currently 404s:  
      <https://gitlab.com/assets/icon_anchor.svg>  
      
      ## What are the relevant issue numbers?
      
      #20459 & !5577
      
      See merge request !6358
      fe3692ac
    • Jacob Schatz's avatar
      Merge branch 'fix-reduce-contributions-calendar-payload' into 'master' · 1c27ab50
      Jacob Schatz authored
      Replace contributions calendar timezone payload with dates
      
      ## What does this MR do?
      Fixes a ~regression bug introduced in !5784 whereby the calendar squares would not render due to a timezone mismatch between the server timezone and the browser (user) timezone. I am now returning the dates instead of the timezone from the backend. There's a good chance we will still have a calendar off by one error (which is an existing issue #1943) but passing dates should make sure that the calendar activity squares render correctly across timezones.
      
      ## Are there points in the code the reviewer needs to double check?
      Double check that this displays the correct calendar squares when the GitLab instance is hosted in a different timezone than the user viewing it
      
      ## Why was this MR needed?
      Fixes ~regression issue 😞 
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-09-13_at_9.47.06_PM](/uploads/d8b41b9b43320f021452e39f29b0e194/Screen_Shot_2016-09-13_at_9.47.06_PM.png)
      
      After:
      ![Screen_Shot_2016-09-13_at_9.46.11_PM](/uploads/e09a3b35eef77ee1cf73b924c3815d3a/Screen_Shot_2016-09-13_at_9.46.11_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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [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)
      
      ## What are the relevant issue numbers?
      Closes #21921
      
      See merge request !6336
      1c27ab50
    • Clement Ho's avatar
      a147b43d
    • Yorick Peterse's avatar
      Merge branch 'feature/use-oj-gem' into 'master' · 1c2aa4f8
      Yorick Peterse authored
      Use oj gem for faster JSON processing
      
      See merge request !6395
      1c2aa4f8
    • Ahmad Sherif's avatar
      Use oj gem for faster JSON processing · f8cc5483
      Ahmad Sherif authored
      It's mainly intended to improve Elasticsearch indexing performance
      (through multi_json gem), but other gems could benefit from it too, like
      grape.
      f8cc5483
    • Rémy Coutable's avatar
      Merge branch 'bump-fog-aws' into 'master' · 6f035810
      Rémy Coutable authored
      Bump fog-aws and other dependent modules
      
      fog-aws CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md
      
      Notable improvements:
      
      * Support for ap-south-1 region
      * Fix for empty ETag values
      
      Closes #22260
      
      See merge request !6392
      6f035810
    • Rémy Coutable's avatar
      Merge branch... · 9498c4d5
      Rémy Coutable authored
      Merge branch '22256-nomethoderror-api-entities-note-missing-attribute-note-on-awardemoji-0x00000015142480' into 'master'
      
      Fix API notes endpoint when posting only emoji
      
      Closes #22256
      
      See merge request !6387
      9498c4d5
    • Stan Hu's avatar
      Bump fog-aws and other dependent modules · 0f3afca3
      Stan Hu authored
      Closes #22260
      0f3afca3
    • Z.J. van de Weg's avatar
      cf00fbec