1. 13 Sep, 2016 4 commits
    • Valery Sizov's avatar
      Merge branch 'es_global_search' into 'master' · 574d75cb
      Valery Sizov authored
      ES: Global code search
      
      - [x] Basic implementation of blobs search
      - [x] Basic implementation of commits search
      - [x] Fix pagination for commits. Do paginating on ES level instead of resulting array
      - [x] Refactoring. The `gitlab-elastcsearch-git` gem should not know anything specific to GitLab application structure.
      - [ ] Backport changes to CE
         - [ ] Search result parsers (after review this MR)
         - [x] Removing `total_count` (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6216)
      - [x] Make rake tasks pass parent id
      - [x] Test database search afterwards
      - [x] Mention somewhere that ES should be updated to 2.4.0
      - [x] Specs
      - [x] Address TODO in the code
      - [x] Add project name to search results
      
      Related MR for `gitlab-elasticsearch-git` gem (https://gitlab.com/gitlab-org/gitlab-elasticsearch-git/merge_requests/18)
      
      Screenshots:
      
      ![Screen_Shot_2016-09-06_at_16.07.30](/uploads/dca09ee14b9c728ab22b902ed471a071/Screen_Shot_2016-09-06_at_16.07.30.png)
      
      Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/556
      
      See merge request !699
      574d75cb
    • Valery Sizov's avatar
      changelog update · 18a45c9a
      Valery Sizov authored
      18a45c9a
    • Valery Sizov's avatar
      ES: Global code search · dfb441f9
      Valery Sizov authored
      dfb441f9
    • Robert Speicher's avatar
      Merge branch... · 84ff13a8
      Robert Speicher authored
      Merge branch '939-repositoryupdatemirrorworker-updatemirrorerror-rugged-invaliderror-cannot-set-empty-url' into 'master'
      
      Fix mirrored projects allowing empty import urls
      
      Because of missing validations in the projects model, you could
      create a new project with a nil or empty import_url with mirror=true.
      This would cause exceptions when
      RepositoryUpdateMirrorWorker::UpdateMirrorError ran and attempted to
      update one of these projects. This was made easier by the fact that
      you could show the "Mirror repository" checkbox in the UI, check it,
      hide it, and still have its value considered.
      
      The missing validations have been added, and minor adjustments have
      been made to the UI to improve the previous behaviour. A migration
      was also added to update mirror=false in all projects with a nil or
      empty import url that exists because of the described bug.
      
      Closes #939
      
      See merge request !700
      84ff13a8
  2. 12 Sep, 2016 14 commits
  3. 09 Sep, 2016 12 commits
    • Robert Speicher's avatar
      Merge branch '8-12-update-guide' into 'master' · c67b2e81
      Robert Speicher authored
      Add update guide for 8.12 CE to EE.
      
      [ci skip]
      
      See merge request !706
      c67b2e81
    • Alejandro Rodríguez's avatar
      Reduce UPDATE queries when moving between import states on projects · a855aade
      Alejandro Rodríguez authored
      By changing our logic from `before_transition` to `after_transition`
      blocks and removing extra calls to `update` or `save` we can do all
      changes in a single UPDATE query (currently each transition change
      from started -> failed and started -> finished runs two UPDATE
      queries each)
      a855aade
    • Yorick Peterse's avatar
      Merge branch 'feature/instrument-es-code' into 'master' · 361b3a43
      Yorick Peterse authored
      Instrument more ES-related code
      
      See merge request !721
      361b3a43
    • Ruben Davila's avatar
      Merge remote-tracking branch 'ce/master' · d5381c65
      Ruben Davila authored
      d5381c65
    • Achilleas Pipinellis's avatar
      Merge branch 'repository-mirroring-doc-update' into 'master' · fd7df136
      Achilleas Pipinellis authored
      repository_mirroring: update menu entry to "Mirror Repository"
      
      Instead of "Repository Mirroring" it looks like the menu name to configure mirroring is now called "Mirror Repository".
      
      See merge request !724
      fd7df136
    • Achilleas Pipinellis's avatar
      Merge branch 'zj-update-ci-examples-doc' into 'master' · 4bdcbc85
      Achilleas Pipinellis authored
      Minor update on CI docs examples
      
      cc @ayufan @markpundsack 
      
      Commit message: 
      
      > Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is
      organized so far and did a minor clean up. In my opinion we should just
      keep a list of up to date blog posts in the docs and examples should be
      included in gitlab-org/gitlab-ci-yml. This reduces the number of
      projects and docs pages one has to look for information.
      
      See merge request !5806
      4bdcbc85
    • Jacob Vosmaer (GitLab)'s avatar
      Merge branch 'gitlab-workhorse-safeties' into 'master' · b7e6da5a
      Jacob Vosmaer (GitLab) authored
      Security and safety improvements for gitlab-workhorse integration
      
      Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60
      
      - Use a custom content type when sending data to gitlab-workhorse
      - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse
      
      This will allow us to build features in gitlab-workhorse that require
      more trust, and protect us against programming mistakes in the future.
      
      This is designed so that no action is required for installations from
      source. For omnibus-gitlab we need to add code that manages the shared
      secret.
      
      See merge request !5907
      b7e6da5a
    • Rémy Coutable's avatar
      Merge branch 'slash-commands-issuable-spec-fix' into 'master' · 483a28a4
      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
      483a28a4
    • Z.J. van de Weg's avatar
      Minor update on CI docs examples · a9f5b888
      Z.J. van de Weg authored
      Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is
      organized so far and did a minor clean up. In my opinion we should just
      keep a list of up to date blog posts in the docs and examples should be
      included in gitlab-org/gitlab-ci-yml. This reduces the number of
      projects and docs pages one has to look for information.
      
      [ci skip]
      a9f5b888
    • Rémy Coutable's avatar
      Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into 'master' · 12cc675c
      Rémy Coutable authored
      Refresh todos count cache when an Issue/MR is deleted
      
      Fixes #21714
      
      See merge request !6161
      12cc675c
    • Rémy Coutable's avatar
      Merge branch 'sidekiq-ps-parsing' into 'master' · cf76776d
      Rémy Coutable authored
      * Moves splitting of  `ps` result to helper.
      * Users a regexp to extract the different parts
      
      The result of `ps` at least depends on the _LANG_ and the distance of
      _start_ to _now_ (start time then the day + hour then month+day)
      I've tested with _LANG=en_US.UTF-8_ and _LANG=de_CH.UTF-8_
      
      Closes #20632
      
      See merge request !6245
      cf76776d
    • Christian Couder's avatar
  4. 08 Sep, 2016 10 commits