1. 28 Mar, 2016 1 commit
  2. 26 Mar, 2016 1 commit
  3. 23 Mar, 2016 15 commits
    • Rémy Coutable's avatar
      Version 8.6.1 · a96d737b
      Rémy Coutable authored
      a96d737b
    • Rémy Coutable's avatar
      Remove "(unreleased)" from the CHANGELOG · fa4a3d24
      Rémy Coutable authored
      [ci skip]
      fa4a3d24
    • Rémy Coutable's avatar
      Merge branch 'fix-build-dependencies' into 'master' · f45b9bde
      Rémy Coutable authored
      Fix build dependencies, when the dependency is a string
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485
      
      See merge request !3344
      f45b9bde
    • Douwe Maan's avatar
      Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' · 83961f97
      Douwe Maan authored
      Fix sorting issues/mrs by votes on the groups page
      
      Closes #14394
      
      The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
      
      ```ruby
      Issue.reorder(created_at: :desc).joins(:project).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          ORDER BY issues.created_at DESC"
      
      Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          WHERE projects.archived = 'f'
          ORDER BY projects.id DESC"
      
      Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          WHERE projects.archived = 'f'
          ORDER BY issues.created_at DESC"
      ```
      
      /cc @yorickpeterse
      
      See merge request !3333
      83961f97
    • Rémy Coutable's avatar
      Merge branch 'fix/14505' into 'master' · e257e81c
      Rémy Coutable authored
      Fix an issue causing the Dashboard/Milestones page to be blank
      
      Fixes #14505 and #14514.
      
      See merge request !3348
      e257e81c
    • Jacob Schatz's avatar
      Merge branch 'merge-request-sidebar' into 'master' · e1f999a2
      Jacob Schatz authored
      Fixed bug where participants would not work correctly on merge requests
      
      Also fixed alignment bug with can't merge badge
      
      Closes #14478, #14494
      
      See merge request !3329
      e1f999a2
    • Jacob Schatz's avatar
      Merge branch 'issue_13885' into 'master' · 6ba230ea
      Jacob Schatz authored
      Display nav controls on mobile
      
      Set inputs inside .nav-controls to full-width on viewports below 600px
      
      Fixes #13885
      
      **Affected pages**
      
      /dashboard/groups
      
      /admin/builds
      
      /dashboard/projects
      
      /dashboard/issues
      
      /dashboard/merge_requests
      
      /dashboard/milestones
      
      /dashboard/todos
      
      /explore
      
      /groups/{group-name}/issues
      
      /groups/{group-name}
      
      /groups/{group-name}/milestones
      
      /{group-name}/{project-name}/builds
      
      /{group-name}/{project-name}/forks
      
      /{group-name}/{project-name}/issues
      
      /{group-name}/{project-name}/labels
      
      /{group-name}/{project-name}/merge_requests
      
      /{group-name}/{project-name}/milestones
      
      /{group-name}/{project-name}/wikis/home
      
      /{group-name}/{project-name}/wikis/pages
      
      Some Screenshots
      
      **Groups**
      
      ![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)
      
      **Admin > Builds**
      
      ![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)
      
      **TODOs**
      
      ![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)
      
      **Dashboard > Projects**
      
      ![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)
      
      **Project Issues**
      
      ![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)
      
      **Project Merge Requests**
      
      ![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)
      
      See merge request !3214
      6ba230ea
    • Jacob Schatz's avatar
      Merge branch 'fix-milestone-assign' into 'master' · e5abd96c
      Jacob Schatz authored
      Fixes issue with assign milestone not loading milestone list
      
      cc. @jschatz1
      
      See merge request !3346
      e5abd96c
    • Jacob Schatz's avatar
      Merge branch 'label-dropdown-errors' into 'master' · 05856199
      Jacob Schatz authored
      Shows error messages when trying to create label in dropdown menu
      
      Closes #14495
      
      ![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png)
      
      See merge request !3345
      05856199
    • Douwe Maan's avatar
      Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into 'master' · 0af8309e
      Douwe Maan authored
      User has to confirm deletion of issuables
      
      Closes #14474
      
      See merge request !3341
      0af8309e
    • Douwe Maan's avatar
      Merge branch 'move-issue-section-should-not-be-displayed-in-the-new-issue-form-14489' into 'master' · ae407262
      Douwe Maan authored
      Moving of issuables only when the record already exists
      
      Closes #14489
      
      See merge request !3340
      ae407262
    • Jacob Schatz's avatar
      Merge branch 'auto-collapse-nav' into 'master' · 0223a2de
      Jacob Schatz authored
      Auto collapses the navigation when resizing
      
      Closes #14475
      
      ![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif)
      
      See merge request !3343
      0223a2de
    • Jacob Schatz's avatar
      Merge branch 'header-mobile-overflow' into 'master' · 5a20d3ab
      Jacob Schatz authored
      Fixes issue with signin button overflowing on mobile
      
      Closes #14477
      
      ![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)
      
      ![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)
      
      See merge request !3342
      5a20d3ab
    • Douwe Maan's avatar
      Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master' · 3536b17e
      Douwe Maan authored
      Restrict notifications for confidential issues
      
      Closes #14468
      
      /cc @rymai
      
      See merge request !3334
      3536b17e
    • Robert Speicher's avatar
      Merge branch 'drop_db_before_restore' into 'master' · 3129e135
      Robert Speicher authored
      Reload the schema before restoring a database backup
      
      If a user tries to downgrade and restore after a failed upgrade,
      the database may still contain newer tables. Reload the older
      schema before restoring the database to avoid future upgrade
      problems. Also, add a rake task to help users add migration
      versions to the database so it's easier to recover from these
      errors if they do occur. Fixes #13419
      
      See merge request !2807
      3129e135
  4. 22 Mar, 2016 13 commits
  5. 21 Mar, 2016 10 commits
    • Rémy Coutable's avatar
      Version 8.6.0-rc5 · 939f306a
      Rémy Coutable authored
      939f306a
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-image-mode-view-diff' into 'master' · 834dae6f
      Dmitriy Zaporozhets authored
      Fix diff image view modes (2-up, swipe, onion skin) not working
      
      Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8
      
      Closes #13856
      
      See merge request !3316
      834dae6f
    • Rémy Coutable's avatar
      Merge branch 'workhorse-0.7.1' into 'master' · c5e015e9
      Rémy Coutable authored
      Use gitlab-workhorse 0.7.1
      
      A small extra defense against interrupted git raw responses. Nice to
      have in 8.6 because we introduce /raw/ caching; it would be
      unfortunate if incorrect (truncated) responses got cached.
      
      See merge request !3330
      c5e015e9
    • Robert Speicher's avatar
      Merge branch 'issues-show-performance' into 'master' · b8812824
      Robert Speicher authored
      Improve performance of viewing individual issues
      
      This MR does two things:
      
      1. `Issue#related_branches` no longer performs Git operations that aren't needed
      2. The output of `Repository#exists?` is now cached and flushed properly
      
      Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).
      
      See merge request !3296
      b8812824
    • Kamil Trzciński's avatar
      Merge branch 'feature/issue-move' into 'master' · ab3681d1
      Kamil Trzciński authored
      Ability to move issue to another project
      
      Tasks:
      
      - [x] Create scaffold of service that will move issue to another project.
      - [x] Close old issue, add system note about moving issue to a new project.
      - [x] Create a new issue, add system note about issue being moved from old project.
      - [x] Check if issue can be moved to another project before executing service
      - [x] Check permissions when moving an issue (`:admin_issue` ability)
      - [x] Display select box for a new project when editing an issue
      - [x] Show only projects that issue can be moved into in that select box
      - [x] Add project select handler, helper and some permission filters to it
      - [x] Preserve as much information as possible, including author
      - [x] Prepare mechanisms that unfolds local references in issue description
      - [x] Rewrite issue description with references unfolding and add some specs for it
      - [x] Rewrite all system notes and comments attached to issue that is being moved
      - [x] Update `Label` so that is was able to create cross reference labels (separate MR)
      - [x] Add notifications about moving issue to another project
      - [x] Display confirmation alert/message when issue move has been requested
      - [x] Make it possible to undo selecting project where issue will be moved to
      - [x] Add column to issue, that will indicate if it has been moved to another project
      - [x] Do not allow to move issue that has been already moved
      - [x] Write top-to-bottom feature spec in RSpec instead of Spinach
      
      UI:
      
      ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)
      
      ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)
      
      Closes #3024
      
      See merge request !2831
      ab3681d1
    • Robert Speicher's avatar
      Merge branch 'no-gc-retry' into 'master' · c7f3bee7
      Robert Speicher authored
      Do not retry "git gc"
      
      To prevent 'git gc' timing out on a large repo and then bouncing
      around in the retry queue.
      
      See merge request !3266
      c7f3bee7
    • Douwe Maan's avatar
      Merge branch 'fix/gitlab-omniauth-issue' into 'master' · d22c1069
      Douwe Maan authored
      attempting to fix omniauth problem
      
      Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361
      
      See merge request !2876
      d22c1069
    • Jacob Schatz's avatar
      Merge branch 'css-zero-unit-again' into 'master' · a2484ae0
      Jacob Schatz authored
      Fix a few remaining uses of `0px`.
      
      See #14299 for more information.
      
      cc: @jschatz1 
      
      See merge request !3310
      a2484ae0
    • Douwe Maan's avatar
      Merge branch 'fix-image-diff' into 'master' · 21e54d94
      Douwe Maan authored
      Fix bug where wrong commit ID was being used in a merge request diff to show old image
      
      Closes #3769
      
      Closes #14327
      
      See merge request !3300
      21e54d94
    • Jacob Schatz's avatar
      Merge branch 'remove-wip' into 'master' · 42c43041
      Jacob Schatz authored
      Easily (un)mark merge request as WIP using link
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516
      
      ## Link to add `WIP` prefix (underline is visible because of hover)
      ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png)
      
      ## Link to remove `WIP` prefix
      ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png)
      
      ## System note after WIP is added
      ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png)
      
      ## Widget with link to remove WIP
      ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png)
      
      ## Flash after WIP is removed
      ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png)
      
      ## System note after WIP is removed
      ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png)
      
      ## Widget when current user cannot remove the WIP prefix
      ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png)
      
      cc @creamzy 
      
      See merge request !3006
      42c43041