1. 13 Oct, 2016 14 commits
  2. 11 Oct, 2016 4 commits
  3. 29 Sep, 2016 4 commits
  4. 28 Sep, 2016 4 commits
  5. 19 Sep, 2016 4 commits
  6. 14 Sep, 2016 10 commits
    • Rémy Coutable's avatar
      Update VERSION to 8.11.6 · 410d7513
      Rémy Coutable authored
      410d7513
    • Rémy Coutable's avatar
      Update CHANGELOG for 8.11.6 · a5d078ff
      Rémy Coutable authored
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      a5d078ff
    • Douwe Maan's avatar
      Merge branch '21650-only-active-users-can-be-members' into 'master' · c8661341
      Douwe Maan authored
      Exclude some pending or inactivated rows in Member scopes
      
      An unapproved request or not-yet-accepted invite should not give access rights. Neither should a blocked user be considered a member of anything.
      
      One visible outcome of this behaviour is that owners and masters of a group or project may be blocked, yet still receive notification emails for access requests.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21650
      
      See merge request !1994
      c8661341
    • Ruben Davila's avatar
      Fix CHANGELOG. · 6ceb26a0
      Ruben Davila authored
      6ceb26a0
    • Rémy Coutable's avatar
      Merge branch 'fix-allowed-conflict-size' into 'master' · 975205f7
      Rémy Coutable authored
      Fix merge conflict size limit
      
      ## What does this MR do?
      
      The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB!
      
      ## Are there points in the code the reviewer needs to double check?
      
      Don't think so.
      
      ## Why was this MR needed?
      
      Derp.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - Tests
        - [x] 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 !6052
      975205f7
    • Douwe Maan's avatar
      Merge branch 'zj-fix-gitlab-import' into 'master' · 70ddbfc3
      Douwe Maan authored
      Fix GitLab import button
      
      cc @MrChrisW  
      
      Closes gitlab-org/gitlab-ce#21795
      
      See merge request !6167
      70ddbfc3
    • Yorick Peterse's avatar
      Merge branch 'sh-update-db-schema' into 'master' · 86f56119
      Yorick Peterse authored
      Fix DB schema to match latest migration
      
      See merge request !6256
      86f56119
    • Douwe Maan's avatar
      Merge branch... · e708b91d
      Douwe Maan authored
      Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead' into 'master'
      
      Optimize discussion notes resolving and unresolving
      
      ## What does this MR do?
      
      Optimize discussion notes resolving and unresolving
      
      ## Are there points in the code the reviewer needs to double check?
      
      Some changes had to be made to the discussion spec to account for the fact that notes are not  individually updated now. I only focused on adapting them for the purpose of the regression fix, but admittedly they could be further improved in readability.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [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
        - [x] Added for this feature/bug
        - [x] 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?
      
      Closes #21109
      
      See merge request !6141
      e708b91d
    • Rémy Coutable's avatar
      Merge branch 'slash-commands-issuable-spec-fix' into 'master' · 629e21c0
      Rémy Coutable authored
      Fix intermittent spec failures with spec/features/issues/user_uses_slash_commands_spec.rb
      
      This MR solves the intermittent spec failure:
      
      ```
       1) Issues > User uses slash commands behaves like issuable record that supports slash commands in its description and notes note on issue with a note changing the issue's title when current user cannot change title of issue does not reopen the issue
           Failure/Error: Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self)
      
           ActionController::UrlGenerationError:
             No route matches {:action=>"show", :controller=>"projects", :id=>#<Project id: 1, name: "project135", path: "gitlabhq", description: nil, created_at: "2016-08-31 20:45:48", updated_at: "2016-08-31 20:45:48", creator_id: 2, issues_enabled: true, merge_requests_enabled: true, wiki_enabled: true, namespace_id: 2, snippets_enabled: true, last_activity_at: "2016-08-31 20:45:48", import_url: nil, visibility_level: 20, archived: false, avatar: nil, import_status: "none", repository_size: 0.0, star_count: 0, import_type: nil, import_source: nil, commit_count: 0, import_error: nil, ci_id: nil, builds_enabled: true, shared_runners_enabled: true, runners_token: "_rNZHgsHzaDWGbyL3L2F", build_coverage_regex: nil, build_allow_git_fetch: true, build_timeout: 3600, pending_delete: false, public_builds: true, pushes_since_gc: 0, last_repository_check_failed: nil, last_repository_check_at: nil, container_registry_enabled: true, only_allow_merge_if_build_succeeds: false, has_external_issue_tracker: false, repository_storage: "default", request_access_enabled: true, has_external_wiki: false, lfs_enabled: nil>, :namespace_id=>nil} missing required keys: [:namespace_id]
           Shared Example Group: "issuable record that supports slash commands in its description and notes" called from ./spec/features/issues/user_uses_slash_commands_spec.rb:6
           # ./app/models/project.rb:611:in `web_url'
           # ./app/models/project.rb:975:in `hook_attrs'
           # ./lib/gitlab/data_builder/note.rb:58:in `build_base_data'
           # ./lib/gitlab/data_builder/note.rb:38:in `build'
           # ./app/services/notes/post_process_service.rb:19:in `hook_data'
           # ./app/services/notes/post_process_service.rb:23:in `execute_note_hooks'
           # ./app/services/notes/post_process_service.rb:14:in `execute'
           # ./app/workers/new_note_worker.rb:10:in `perform'
           # ./app/services/notes/create_service.rb:29:in `execute'
           # ./app/controllers/projects/notes_controller.rb:26:in `create'
           # ./lib/gitlab/request_profiler/middleware.rb:15:in `call'
           # ./lib/gitlab/middleware/go.rb:16:in `call'
           # ./lib/gitlab/middleware/static.rb:9:in `call'
      ```
      
      There were a number of issues:
          
      1. Sidekiq async tasks were being run after project namespaces were deleted. Use Sidekiq in fake mode to prevent this from Sidekiq tasks from being enqueued in the first place.
      2. Some outstanding Ajax requests (e.g. autocomplete) were still being loaded while `DatabaseCleaner` ran
      3. `logout` did not always wait for logout actually to complete
        
      Closes #21723
      
      See merge request !6271
      629e21c0
    • Jacob Schatz's avatar
      Merge branch 'fix-pipeline-horizontal-scrolling' into 'master' · ab4b65a8
      Jacob Schatz authored
      Fix unnecessary horizontal scroll area in pipeline visualizations
      
      ## What does this MR do?
      
      Removes a min-width attribute for the build pipeline visualization wrapper
      
      ## Are there points in the code the reviewer needs to double check?
      
      I am curious why this line was there in the first place.  Perhaps I'm just not seeing it.
      
      ## Why was this MR needed?
      
      I was noticing an unnecessary horizontal scroll bar when viewing pipeline visualizations embedded in merge request builds tab:
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5627/builds
      
      ## What are the relevant issue numbers?
      
      Line appears to have been introduced in !5742
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-08-24_at_11.15.13_PM](/uploads/e395ed8d4415187735d06b8386fe4633/Screen_Shot_2016-08-24_at_11.15.13_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      As this is a very simple cosmetic change, I don't think it warrants inclusion in the changelog, documentation, or tests.
      
      - [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 !6005
      ab4b65a8