Skip to content

G
gitlab-foss

李少辉-开发者 / gitlab-foss

通知 15
Star 0
Fork 0
G
gitlab-foss

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

切换分支/标签
  1. 27 7月, 2016 32 次提交
  3. 26 7月, 2016 8 次提交
    • S
      Show release notes in tag list · e44bbcb9
      由 Sean McGivern 提交于 
      A release's tag reference is just the name of the tag, not the entire
tag object.

This also fixes the tags index if a tag's message contains non-UTF8 byte
sequences.
      e44bbcb9
    • S
      Merge branch '20156-rescue-reference-create-due-to-file-lock-exists' into 'master' · 8a95f1f3
      由 Stan Hu 提交于 
      Rescue Rugged::OSError (lock exists) when creating references.

## What does this MR do?

Rescue an exception on concurrent scenarios. I was able to create a spec for this, because if you create the lock file before trying to create the reference the reference is created without a problem and the lock file is removed. So IMHO there is a race condition where more than one process is trying to create the same reference at the same time raising the exception, so I just added the patch without specs.

```ruby
    it "attempting to call keep_around when exists a lock does not fail" do
      ref = repository.send(:keep_around_ref_name, sample_commit.id)
      path = File.join(repository.path, ref)
      lock_path = "#{path}.lock"

      FileUtils.mkdir_p(path)
      File.open(lock_path, 'w') { |f| f.write('') }

      begin
        # No exception is raised because the lock file is removed at some point in the process
        repository.keep_around(sample_commit.id)
      ensure
        File.delete(path)
        File.delete(lock_path)
      end
    end
```

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #20156

## Screenshots (if relevant)

## 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
  - [ ] 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 !5497
      8a95f1f3
    • F
      Merge branch '20139-branch-icon' into 'master' · 9cf1bf64
      由 Fatih Acet 提交于 
      Add branch or tag icon to ref in builds page

## What does this MR do?
Add branch or tag icon to ref in builds page

## Why was this MR needed?
It's currently missing but should be there

## What are the relevant issue numbers?
Closes #20139 

## Screenshots (if relevant)
<img src="/uploads/fb5c9a285a1ce95c0aa8dfa5e32c5d7d/Screen_Shot_2016-07-22_at_9.14.39_AM.png" width="400px">


See merge request !5434
      9cf1bf64
    • R
      Merge branch '20241-expand-all-button-breaks-diff-comparison-view' into 'master' · 63fe21c8
      由 Rémy Coutable 提交于 
      Fix expand all diffs button in compare view

## What does this MR do?

Fix the expand all diffs button in compare view.

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

Don't think so.

## Why was this MR needed?

We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' to the URL, which
breaks the compare view (and looks bad). Setting it to `nil` uses the
default format, which in all of these cases is HTML anyway.


## What are the relevant issue numbers?

Closes #20241.

See merge request !5500
      63fe21c8
    • R
      Merge branch 'multiple-trigger-variables-show-in-separate-line' into 'master' · 2f5fdfe3
      由 Rémy Coutable 提交于 
      Multiple trigger variables show in separate line

## What does this MR do?
Separate lines for multiple trigger variables

## Screenshot
![Zrzut_ekranu_2016-07-19_o_13.05.01](/uploads/a6f9ec842f65266ae38922b1e9d5ab84/Zrzut_ekranu_2016-07-19_o_13.05.01.png)

## What are the relevant issue numbers?
Closes #19006 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Add tests for multiple trigger variables view
  - [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)

cc @ubudzisz @grzesiek @yorickpeterse @tmaczukin [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash)

See merge request !5357
      2f5fdfe3
    • S
      Fix expand all diffs button in compare view · 3abffb2b
      由 Sean McGivern 提交于 
      We can't reuse the existing value of the format parameter, because on
the merge request page that's 'json', so the link would go to a JSON
file. We can't set it to HTML, because that adds '.html' the URL, which
breaks the compare view (and looks bad). Setting it to nil uses the
default format, which in all of these cases is HTML anyway.
      3abffb2b
    • R
      Add route for Import::GithubController#new · 065c428a
      由 Rémy Coutable 提交于 
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      065c428a
    • K
      Update CHANGELOG · ea69ee19
      由 Katarzyna Kobierska 提交于
      ea69ee19