1. 21 Jun, 2016 12 commits
    • Jacob Schatz's avatar
      Merge branch 'lbennett/gitlab-ce-18490-top-area-css-tablet-view' into 'master' · cfa3d881
      Jacob Schatz authored
      Corrected top search area css media query param
      
      ## What does this MR do?
      
      Corrects top search area css media query so it switches styles at the correct screen size.
      
      ## Are there points in the code the reviewer needs to double check?
      
      It's a regression so likely
      
      ## Why was this MR needed?
      
      UX
      
      ## What are the relevant issue numbers?
      
      Closes #18490. (This stops the search bar dropping into its own row until it needs to be 100% column stacked anyway)
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-17_at_17.45.38](/uploads/2278e2cdb1c2de14fc098e30fd5328d8/Screen_Shot_2016-06-17_at_17.45.38.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - [ ] Tests
        - [ ] Added for this feature/bug
        - [ ] 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 !4756
      cfa3d881
    • Yorick Peterse's avatar
      Merge branch '18760-remove-explicate-assignment-on-metrics-action' into 'master' · 52e11841
      Yorick Peterse authored
      Remove explicit Gitlab::Metrics.action assignments, are already automatic.
      
      See merge request !4731
      52e11841
    • Jacob Schatz's avatar
      Merge branch 'fix-merge-on-success-widget-buttons' into 'master' · 88762085
      Jacob Schatz authored
      Fixed merge on success widget buttons on mobile
      
      ## What does this MR do?
      
      Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Ney
      
      ## Why was this MR needed?
      
      mobile UX
      
      ## What are the relevant issue numbers?
      
      Closes #18610.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-17_at_03.09.36](/uploads/b662e1b7ad683cd89f1233a859caccb2/Screen_Shot_2016-06-17_at_03.09.36.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - [ ] Tests
        - [ ] Added for this feature/bug
        - [ ] 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 !4726
      88762085
    • Achilleas Pipinellis's avatar
      Merge branch 'email-on-push' into 'master' · 372e962a
      Achilleas Pipinellis authored
      Document email on push service
      
      Addresses https://gitlab.com/gitlab-org/gitlab-ee/issues/80
      
      See merge request !4698
      372e962a
    • Jacob Schatz's avatar
      Merge branch 'empty-state-project-page' into 'master' · 64e9d9b4
      Jacob Schatz authored
      Fix regressions in the design of the project statistics bar.
      
      ## What does this MR do?
      
      Improves the design of the empty Changelog, Contribution guide, and License items in the project statistics bar.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Don't think so, maybe that the `project-stats` class isn't used anywhere else (a grep suggests it's not)
      
      ## Why was this MR needed?
      
      Because the empty state of the repository didn't look as good anymore.
      
      ## What are the relevant issue numbers?
      #18734
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![Screen_Shot_2016-06-16_at_12.15.22_PM](/uploads/a5c27d696af186346a2298071c90ba2d/Screen_Shot_2016-06-16_at_12.15.22_PM.png)
      
      After:
      
      ![Screen_Shot_2016-06-16_at_12.59.38_PM](/uploads/8719d3ee507affd4ce7ea479a5422908/Screen_Shot_2016-06-16_at_12.59.38_PM.png)
      
      See merge request !4717
      64e9d9b4
    • Jacob Schatz's avatar
      Merge branch 'diff-commit-id-weight' into 'master' · 761212ac
      Jacob Schatz authored
      Fixes font weight of commit id on view file button
      
      ## What does this MR do?
      
      Changes the weight to normal. With the new commit UI - this had turned bold and didn't match the designs.
      
      Should it also be our normal font family? According to designs it is - but everywhere else there is a commit ID it has the monospace font.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-16_at_17.25.33](/uploads/bb76d576c10be65172d5f4e9790ca766/Screen_Shot_2016-06-16_at_17.25.33.png)
      
      See merge request !4713
      761212ac
    • Jacob Schatz's avatar
      Merge branch 'image-border' into 'master' · 560cea74
      Jacob Schatz authored
      Add borders to images in issues, MRs, and Help.
      
      ## What does this MR do?
      
      Adds a gray border around images in Issues, MRs, and Help pages.
      
      ## Are there points in the code the reviewer needs to double check?
      
      That this doesn't effect other elements or pages that it shouldn't.
      
      ## Why was this MR needed?
      
      It was hard to differentiate between the actual interface and screenshots of it.
      
      ## What are the relevant issue numbers?
      
      Fixes #18578 
      
      ## Screenshots (if relevant)
      
      ### Issues/MRs
      
      Before:
      
      ![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png)
      
      After:
      
      ![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png)
      
      ![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png)
      
      ### Help
      
      Before:
      
      ![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png)
      
      After:
      
      ![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [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)
      
      cc: @jschatz1
      
      See merge request !4655
      560cea74
    • Jacob Schatz's avatar
      Merge branch 'note-emoji-system-note' into 'master' · 762c8a98
      Jacob Schatz authored
      Hides award emoji & access level on system notes
      
      ## What does this MR do?
      
      Hides award emoji & access level on system notes as they aren't applicable to them notes.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)
      
      See merge request !4629
      762c8a98
    • Jacob Schatz's avatar
      Merge branch 'notification-dropdown-active-fix' into 'master' · 605e1229
      Jacob Schatz authored
      Fixed issue with notification dropdown not updating active
      
      ## What does this MR do?
      
      This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success.
      
      ## What are the relevant issue numbers?
      
      Closes #18480 
      
      ## Screenshots (if relevant)
      
      ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif)
      
      See merge request !4615
      605e1229
    • Jacob Schatz's avatar
      Merge branch 'async-refs-dropdown' into 'master' · 16b42187
      Jacob Schatz authored
      Refs dropdown is now loaded async
      
      ## What does this MR do?
      
      The refs dropdown is loaded async so not to block the page.
      
      ## What are the relevant issue numbers?
      
      Part of #18202
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)
      
      See merge request !4508
      16b42187
    • Rémy Coutable's avatar
      Merge branch 'ci-lfs-fetch' into 'master' · 6d0f9bbc
      Rémy Coutable authored
      Allow to fetch LFS from CI
      
      ## What does this MR do?
      
      This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI).
      
      ## What is left?
      
      - [x] Write tests covering a new authorization mechanism
      
      cc @grzesiek @marin
      
      See merge request !4465
      6d0f9bbc
    • Rémy Coutable's avatar
      Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into 'master' · 95621c01
      Rémy Coutable authored
      Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view
      
      ## What does this MR do?
      
      Sets a default stage on old `ci_builds`.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Is the migration acceptable for online execution?
      
      ## Why was this MR needed?
      
      Old `ci_builds`with no stages cause a regression on the pipelines index view.
      
      ## What are the relevant issue numbers?
      
      #17949 
      
      Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680
      
      
      See merge request !4381
      95621c01
  2. 20 Jun, 2016 16 commits
  3. 18 Jun, 2016 12 commits