Skip to content

G
gitlab-foss

李少辉-开发者 / gitlab-foss

通知 15
Star 0
Fork 0
G
gitlab-foss

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

切换分支/标签
  1. 09 9月, 2016 16 次提交
    • A
      Merge branch 'zj-update-ci-examples-doc' into 'master' · 4bdcbc85
      由 Achilleas Pipinellis 提交于 
      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
    • J
      Merge branch 'gitlab-workhorse-safeties' into 'master' · b7e6da5a
      由 Jacob Vosmaer (GitLab) 提交于 
      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
      Merge branch 'slash-commands-issuable-spec-fix' into 'master' · 483a28a4
      由 Rémy Coutable 提交于 
      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
      Minor update on CI docs examples · a9f5b888
      由 Z.J. van de Weg 提交于 
      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
      Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into 'master' · 12cc675c
      由 Rémy Coutable 提交于 
      Refresh todos count cache when an Issue/MR is deleted

Fixes #21714

See merge request !6161
      12cc675c
    • R
      Merge branch 'sidekiq-ps-parsing' into 'master' · cf76776d
      由 Rémy Coutable 提交于 
      * 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
    • S
      Move write_note into SlashCommandsHelper and update other dependent specs · f1235491
      由 Stan Hu 提交于
      f1235491
    • S
      Wait for logout message in login_helpers · 65eadf98
      由 Stan Hu 提交于
      65eadf98
    • S
      Use wait_for_ajax to avoid database deadlocks after specs are cleaned · 26e4d00e
      由 Stan Hu 提交于
      26e4d00e
    • S
      Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb · 22ee3f54
      由 Stan Hu 提交于 
      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.

Closes #21723
      22ee3f54
    • D
      Update CHANGELOG · 28e6bb39
      由 Douglas Barbosa Alexandre 提交于
      28e6bb39
    • D
      Refresh todos count cache when an Issue/MR is deleted · d86c6666
      由 Douglas Barbosa Alexandre 提交于
      d86c6666
    • A
      Merge branch 'support-long-branch-namers' into 'master' · 796bdf1d
      由 Annabel Dunstone Gray 提交于 
      Give project selection dropdowns responsive width, long names wrap.

## What does this MR do?

Makes two dropdown menus (branch name selector & project selector) wider on larger screens, and allows their contents to wrap.

## Are there points in the code the reviewer needs to double check?

Sanity check. 

## Why was this MR needed?

Considered a regression, as users who relied on long branch names could no longer see them fully. 

## Screenshots (if relevant)

Before: 
![Screen_Shot_2016-08-30_at_2.50.43_PM](/uploads/e0252cb02c5f34f3c777d2d67028042f/Screen_Shot_2016-08-30_at_2.50.43_PM.png)

After:
![Screen_Shot_2016-08-30_at_2.49.35_PM](/uploads/b504e0f3e139c85699bc5aafb58199f3/Screen_Shot_2016-08-30_at_2.49.35_PM.png)

After (updated after fixes, including project selector): 

![Screen_Shot_2016-09-02_at_1.46.53_PM](/uploads/b480fc8193f713ce43518cb83886fd52/Screen_Shot_2016-09-02_at_1.46.53_PM.png)

![Screen_Shot_2016-09-02_at_1.50.26_PM](/uploads/f0d31702668e83e6c0c24782cc43fdbd/Screen_Shot_2016-09-02_at_1.50.26_PM.png)
## 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)
- [x] 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)
- [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)

## What are the relevant issue numbers?

Closes #15633

See merge request !6105
      796bdf1d
    • P
      Remove original regexp · 76c7b83d
      由 Pascal Betz 提交于
      76c7b83d
    • R
      Merge branch 'smart-pipeline-duration' into 'master' · eb2d2066
      由 Rémy Coutable 提交于 
      Smartly calculate real running time and pending time

## What does this MR do?

Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on:

> Suppose we have A, B, and C jobs:

> * A: from 1 to 3
> * B: from 2 to 4
> * C: from 6 to 7

> The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`)

## Are there points in the code the reviewer needs to double check?

I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected.

## Screenshots:

![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.png)

## 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)
- Tests
  - [x] Added for this feature/bug

## What are the relevant issue numbers?

Closes #18260, #19804

See merge request !6084
      eb2d2066
    • R
      Merge branch 'pipeline-hooks' into 'master' · 4c833a1d
      由 Rémy Coutable 提交于 
      Implement Slack integration for pipeline hooks

## What does this MR do?

Add pipeline events to Slack integration

## 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)
- Tests
  - [x] Added for this feature/bug

See merge request !5525
      4c833a1d
  3. 08 9月, 2016 24 次提交