1. 06 Sep, 2016 8 commits
    • Fatih Acet's avatar
      Merge branch 'fix-suggested-colors-options-for-new-labels-in-the-admin-area' into 'master' · 4f4fa293
      Fatih Acet authored
      Fix suggested colors options for new labels in the admin area
      
      ## What does this MR do?
      
      Execute the JS related to the suggested colors options when user access the new label in the admin area.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Clicking in a suggested color when creating a new label in the admin area don't change the background color.
      
      ## Screenshots (if relevant)
      
      * Before
      
          ![2016-08-31_19.56.14](/uploads/3d50236dac578910c5062aa1e83da350/2016-08-31_19.56.14.gif)
      
      * After
      
          ![2016-08-31_19.58.59](/uploads/376ffdcbb5b80ef51ab1d642fe9486d0/2016-08-31_19.58.59.gif)
      
      ## Does this MR meet the acceptance criteria?
      
      - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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)
      - [ ] 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?
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21726
      
      See merge request !6138
      4f4fa293
    • Yorick Peterse's avatar
      Merge branch 'sh-reload-find-branch' into 'master' · f6af87fb
      Yorick Peterse authored
      Optimize branch lookups and force a repository reload for Repository#find_branch
      
      See merge request !6087
      f6af87fb
    • Fatih Acet's avatar
      Merge branch 'issue-boards-issues-total-count' into 'master' · d950556b
      Fatih Acet authored
      Add the total number of issues in the JSON response in issue board lists
      
      Add the total number of issues in the JSON response in issue board lists
      
      The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll.
      
      Closes #21327
      
      See merge request !5904
      Conflicts:
      	app/assets/stylesheets/pages/boards.scss
      	app/views/projects/boards/components/_board.html.haml
      d950556b
    • Rémy Coutable's avatar
      Merge branch 'fix/gitlab-export-confidential' into 'master' · d4aff2e7
      Rémy Coutable authored
      Fix confidential issues made public after import
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21803
      
      The gitlab.com import was ignoring the confidential attribute, hence making all issues public after being imported.
      
      The API has changed in order to also expose this field.
      
      See merge request !1992
      d4aff2e7
    • Douwe Maan's avatar
      Merge branch 'fix-confidential-issues-webhooks' into 'master' · c01fa530
      Douwe Maan authored
      Scope webhooks/services that will run for confidential issues
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20661
      
      See merge request !1986
      Conflicts:
      	db/schema.rb
      c01fa530
    • Fatih Acet's avatar
      Merge branch 'icon-button-alignment' into 'master' · 96342b8a
      Fatih Acet authored
      Fix alignment of icon buttons
      
      ## What does this MR do?
      
      Fix misalignment of buttons with only an icon which was introduced by !5451.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627
      
      ## Screenshots
      
      ### Before
      
      ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png)
      
      ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png)
      
      ### After
      
      ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png)
      
      ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png)
      
      
      See merge request !5887
      96342b8a
    • Jacob Schatz's avatar
      Merge branch 'button-icons-alignment' into 'master' · 1c01dbda
      Jacob Schatz authored
      Fix icon alignment of star and fork buttons
      
      ## What does this MR do?
      
      Fix alignment of star and fork icons.
      
      ## Why was this MR needed?
      
      Buttons had more padding on the left than on the right.
      
      ## What are the relevant issue numbers?
      
      fixes #20001 
      
      ## Screenshots
      
      <table>
      <thead><th>Before</th><th>After</th></thead>
      <tr>
        <td><img alt="fork-button-before" src="/uploads/664c0bc935f4c48899f5b63a1c215cbc/fork-button-before.png"></td>
        <td><img alt="fork-button-after" src="/uploads/9385427a5b178487bd24cd2f8ec4a5ed/fork.png"></td>
      </tr>
      <tr>
        <td><img alt="project-buttons-before" src="/uploads/48ef41458433b468afc2919eb24849cc/project-buttons-before.png"></td>
        <td><img alt="project-buttons-after" src="/uploads/3bafe6e68645d787a2cdb79cd164335f/project-actions.png"></td>
      </tr>
      </table>
      
      See merge request !5451
      1c01dbda
    • Jacob Schatz's avatar
      Merge branch 'todos-hover-state' into 'master' · 74e352b7
      Jacob Schatz authored
      Add hover state to todos
      
      ## What does this MR do?
      
      - Add a hover state to todos like for repository files.
      - Fix button alignment in todos
      - Add link to avatar in todos
      
      ## Are there points in the code the reviewer needs to double check?
      
      The `border-collapse` part&mdash;is there any better way?
      
      ## Why was this MR needed?
      
      Make hover states consistent.
      
      ## What are the relevant issue numbers?
      
      fixes #19833 
      
      ## Screenshots
      
      ### Before
      
      ![before](/uploads/cd2e7b234bf08fac48aebb60cdfa26a9/before.png)
      
      ### After
      
      ![todos-list](/uploads/592457050cb3ff2c43dfcce78418c50b/todos-list.png)
      
      ![todos-list-last-hover](/uploads/532714333bc74d1656a5c767012b4cdd/todos-list-last-hover.png)
      
      ![todos-mobile](/uploads/d542b04ddebc9d4354d57151dd04c0d2/todos-mobile.png)
      
      See merge request !5361
      74e352b7
  2. 05 Sep, 2016 2 commits
  3. 01 Sep, 2016 4 commits
  4. 31 Aug, 2016 26 commits