1. 26 Aug, 2016 4 commits
    • Stan Hu's avatar
      Merge branch 'fix-changelog' into 'master' · b15d6799
      Stan Hu authored
      Fix changelog
      
      
      
      See merge request !6035
      b15d6799
    • Robert Speicher's avatar
      Merge branch 'fix-external-issue-tracker-link' into 'master' · bf84a1cb
      Robert Speicher authored
      Fix external issue tracker "Issues" link leading to 404s
      
      ## What does this MR do?
      
      This MR fixes the redirection to the wrong URL when using an external issue tracker, such as JIRA or Redmine.  a70431f8 modified the behavior to link to the external issue tracker
      issues URL instead of the project path URL. This restores the previous behavior.
      
      ## Why was this MR needed?
      
      The issues URL often has `:id` associated with it for linking mentioned issues.
      For external issue trackers, the project page is the intended target.
      
      ## What are the relevant issue numbers?
      
      Closes #21252
      
      Related to #21402
      
      See merge request !6006
      bf84a1cb
    • Robert Speicher's avatar
      Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'master' · ef575846
      Robert Speicher authored
      Handle unavailable system info
      
      ## What does this MR do?
      
      Handle the case where we can't get system info without blowing up. As this is the first tab in the monitoring section, it's difficult to get to the other tabs if this page throws a 500. Also be more specific about the info we want, so we don't fail on something we don't care about (like `/proc/net/dev`).
      
      ## Why was this MR needed?
      
      grsecurity can prevent users from reading `/proc`, which is what Vmstat uses to find CPU and memory info.
      
      ## What are the relevant issue numbers?
      
      Closes #21378.
      
      See merge request !5989
      ef575846
    • Douwe Maan's avatar
  2. 24 Aug, 2016 6 commits
  3. 23 Aug, 2016 17 commits
  4. 22 Aug, 2016 3 commits
  5. 21 Aug, 2016 2 commits
  6. 20 Aug, 2016 8 commits
    • Jacob Schatz's avatar
      Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' into 'master' · 9510073d
      Jacob Schatz authored
      17465 Fixed dropdown cursor key navigation
      
      ## What does this MR do?
      This MR fixes the use of cursor/arrow/enter key events with search dropdowns, allowing a user to navigate up and down the list with the arrow keys and then select their item with the enter key.
      It also applies some *minor* scroll user experience fixes, such as resetting the selected dropdown item every time it opens/closes (also stops multiple dropdowns conflicting) and forcing the dropdown scroll to scroll right to the top or bottom depending on whether they have selected the first or last item, respectively.
      
      ## Are there points in the code the reviewer needs to double check?
      I would like someone with GitLab experience to check over whether this would harm any unique implementations of the GitLabDropdown or SearchAutocomplete.
      
      ## Why was this MR needed?
      The current version has incorrectly behaving search dropdowns in the navbar, they either do not navigate using the keyboard or do not use the enter keystroke to select a highlighted item.
      
      ## What are the relevant issue numbers?
      Fixes #17465.
      Closes #20752.
      Closes #21014.
      **Contributes** to #20754.
      
      ## Screenshots (if relevant)
      ![17465.mp4](/uploads/1145abec226036abbaaa4aa46020f52b/17465.mp4)
      
      See merge request !4781
      9510073d
    • Rubén Dávila Santos's avatar
      Merge branch 'fix-rspec-failures-due-to-cached-permissions' into 'master' · 92d568ac
      Rubén Dávila Santos authored
      Fix assorted rspec failures due to stale, cached user permissions
      
      RequestStore is disabled in tests, but the Ability class was caching user permissions based on the user and project ID of previous test runs. Revise code to use RequestStore only if it is active.
      
      See merge request !5919
      92d568ac
    • Marin Jankovski's avatar
      Merge branch 'gitlab_shell_version_update' into 'master' · 0f2ffb74
      Marin Jankovski authored
      Update gitlab-shell to v3.4.0
      
      Part of Redis Sentinel support: gitlab-org/gitlab-shell#29
      
      See merge request !5920
      0f2ffb74
    • Rubén Dávila Santos's avatar
      Merge branch 'fix-network-graph-error-500' into 'master' · 707bb9dc
      Rubén Dávila Santos authored
      Fix Error 500 resulting when loading network graph
      
      `discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute:
      
      ```ruby
      irb(main):019:0> notes[0]
        Note Load (10.3ms)  SELECT notes.commit_id, count(notes.id) as note_count FROM "notes" WHERE "notes"."project_id" = $1 AND (noteable_type = 'Commit') GROUP BY notes.commit_id  [["project_id", 13083]]
      ActiveModel::MissingAttributeError: missing attribute: discussion_id
      ```
      
      Closes #21119, #21128
      
      See merge request !5922
      707bb9dc
    • Ruben Davila's avatar
      Update VERSION to 8.11.0-rc6 · 8df13ef6
      Ruben Davila authored
      8df13ef6
    • Ruben Davila's avatar
      26d131a4
    • Douwe Maan's avatar
      Merge branch '581-ee-backport-branch-permissions' into 'master' · 658ebce4
      Douwe Maan authored
      Backport  changes from gitlab-org/gitlab-ee!581
      
      
      
      See merge request !5884
      658ebce4
    • Robert Speicher's avatar
      Merge branch 'disable-issue-by-email' into 'master' · b5913040
      Robert Speicher authored
      Disable “issue by email” feature until it uses a different token
      
      Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11.
      
      See merge request !5915
      b5913040