1. 09 Sep, 2016 13 commits
    • Robert Speicher's avatar
      Merge branch 'branches-mr-button-permissions' into 'master' · 333cb573
      Robert Speicher authored
      Hides merge request button on branches page
      
      ## What does this MR do?
      
       If user does not have the correct permissions, the merge request button is hidden
      
      ## What are the relevant issue numbers?
      
      Closes #21805
      
      See merge request !6181
      333cb573
    • Robert Speicher's avatar
      Merge branch 'workhorse-0.8.1' into 'master' · 06438c74
      Robert Speicher authored
      Use gitlab-workhorse 0.8.1
      
      Adds Sentry support in gitlab-workhorse.
      
      See merge request !6283
      06438c74
    • Rémy Coutable's avatar
      Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' · 2c050dfe
      Rémy Coutable authored
      Avoid conflict with Admin labels when importing GitHub labels
      
      If the GitHub project have duplicated labels from the Admin labels, the importer will use the Admin label.
      
      Fixes #21319
      
      See merge request !6158
      2c050dfe
    • Jacob Vosmaer's avatar
      Use gitlab-workhorse 0.8.1 · 53615c30
      Jacob Vosmaer authored
      This adds (basic) Sentry support.
      53615c30
    • Douglas Barbosa Alexandre's avatar
      Update CHANGELOG · 599817a3
      Douglas Barbosa Alexandre authored
      599817a3
    • Douglas Barbosa Alexandre's avatar
    • Jacob Schatz's avatar
      Merge branch '20300-restore-comments' into 'master' · 2b3a1da6
      Jacob Schatz authored
      Restore comments lost when converting CoffeeScript to JavaScript
      
      ## What does this MR do?
      
      Restores comments lost in the great fire of !5464.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      #20300
      
      ## What are the relevant issue numbers?
      
       - #20300 (comments)
       - #20098 (ES6)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [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
        - [ ] Added for this feature/bug
        - [ ] All builds are passing
      - [ ] 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)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      Closes #20300
      
      See merge request !5541
      2b3a1da6
    • 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
  2. 08 Sep, 2016 27 commits