提交 · 5098ad9d3c892b2ba117950eac8770fcfad9e53b · 李少辉-开发者 / gitlab-foss

18 11月, 2015 5 次提交
- D
  Merge branch 'remove-code-duplication' · 5098ad9d
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5098ad9d
- R
  Bump VERSION · 6f6c75cb
  由 Robert Speicher 提交于 11月 17, 2015
```
[ci skip]
```
  6f6c75cb
- R
  Merge branch 'param-view' into 'master' · b7b49dab
  由 Robert Speicher 提交于 11月 17, 2015
```
See merge request !1816
```
  b7b49dab
- R
  Update CHANGELOG · 85102d09
  由 Robert Speicher 提交于 11月 17, 2015
```
[ci skip]
```
  85102d09
- R
  Update monthly release template · 4597f8ef
  由 Robert Speicher 提交于 11月 17, 2015
```
[ci skip]
```
  4597f8ef
17 11月, 2015 32 次提交
- R
  Merge pull request #9833 from huacnlee/fix/pr-9820-missings · 475a5b5a
  由 Robert Speicher 提交于 11月 17, 2015
```
Don't render note edit forms for visitors
```
  475a5b5a
- D
  
  Don't use params[:view] directly. · e49190ca
  由 Douwe Maan 提交于 11月 17, 2015
  
  e49190ca
- J
  Avoid render edit_form when visitor can't edit them. · 3ae1dee4
  由 Jason Lee 提交于 11月 16, 2015
```
Reverted #9820, github/task_list need a form, textarea for update.
```
  3ae1dee4
- R
  Merge branch 'rs-revert-gh-9820' into 'master' · df0110ba
  由 Robert Speicher 提交于 11月 17, 2015
```
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd0, reversing
changes made to 8ab5df9d.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804
```
  df0110ba
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 1c040b3f
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
  
  1c040b3f
- D
  Code duplication check should be enabled now · fab04fac
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fab04fac
- D
  Remove small code duplication in user_reference_filter.rb · 49e32cb5
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  49e32cb5
- D
  Refactor similar code for Issue and MR update service · 84b5d035
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84b5d035
- R
  Merge pull request #9837 from Great-Antique/master · 6379978c
  由 Robert Schilling 提交于 11月 17, 2015
```
Fix md syntax in doc/api/commits.md
```
  6379978c
- D
  
  Fix md syntax in doc/api/commits.md · 4de50a86
  由 Den Girnyk 提交于 11月 17, 2015
  
  4de50a86
- D
  Remove code duplication in notification_service.rb · 9b0efdb7
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9b0efdb7
- D
  Remove duplication in mailers/emails/notes.rb · 616675b4
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  616675b4
- D
  Set higher flay value to avoid unnecessary refactoring for now · 4747412a
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4747412a
- D
  Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb · 3cebe9e7
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3cebe9e7
- D
  Remove duplication in diff_helper.rb · 437d4c76
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  437d4c76
- D
  Remove code duplication in gitlab_markdown_helper.rb · 5f239093
  由 Dmitriy Zaporozhets 提交于 11月 17, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f239093
- D
  Merge branch 'issue/vars-need-eval' into 'master' · 93262415
  由 Douwe Maan 提交于 11月 17, 2015
```
Ensure variable in mail is evalled

I received this snippet in the mail:

```
  Content-Type: text/plain;
   charset=UTF-8
  Content-Transfer-Encoding: 7bit
  
  Project #{@old_path_with_namespace} was moved to another location
  
  The project is now located under
```

This MR fixes it.

Notes:

* I did a quick grep on other 'text.erb' files, but this was the only one with this type of error
* I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part

See merge request !1706
```
  93262415
- D
  Merge branch 'rs-wiki-touches-project' into 'master' · c12d0b4d
  由 Douwe Maan 提交于 11月 17, 2015
```
Make ProjectWiki touch Project#last_activity_at after wiki actions

Closes #3026

See merge request !1803
```
  c12d0b4d
- A
  Merge branch 'http-to-https' into 'master' · 03cb8edb
  由 Achilleas Pipinellis 提交于 11月 17, 2015
```
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
```
  03cb8edb
- A
  
  Rewrite HTTP links to force TLS, where possible · 3300db70
  由 Alex Jordan 提交于 11月 16, 2015
  
  3300db70
- D
  Remove duplication in issue emails · bfbfa3b5
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bfbfa3b5
- D
  Allow flay to fail for now since there is still a lot of refactoring todo · 9573e06e
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9573e06e
- D
  Remove duplication in reference filters · 79fa6c64
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  79fa6c64
- D
  Refactor select2 tags · adec8c77
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  adec8c77
- D
  Dont allow code duplication check to fail · da26fd3f
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  da26fd3f
- D
  Merge branch 'global-milestones' into 'master' · 0061143c
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Create milestones in the group

When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so

For #3488 
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1797
```
  0061143c
- D
  Some code and doc improvements · b093f509
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b093f509
- R
  Merge branch 'rs-rc1-docs' into 'master' · 66c76053
  由 Robert Speicher 提交于 11月 16, 2015
```
8.2.rc1 documentation updates

[ci skip]

See merge request !1798
```
  66c76053
- R
  Make ProjectWiki touch Project#last_activity_at after wiki actions · ccb0c40c
  由 Robert Speicher 提交于 11月 15, 2015
```
Closes #3026
```
  ccb0c40c
- R
  Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" · c8e53d44
  由 Robert Speicher 提交于 11月 15, 2015
```
This reverts commit 63144cd0, reversing
changes made to 8ab5df9d.
```
  c8e53d44
- D
  Fix removing avatar for group · 32f1a719
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32f1a719
- D
  Merge branch 'add_index_uniq' into 'master' · 43d5eca0
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Add index uniq

Added unique on oid index. Removed the second index since it is unnecessary. 

See merge request !1810
```
  43d5eca0
16 11月, 2015 3 次提交
- D
  Group masters should be able to create/close milestones · 929ab909
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  929ab909
- D
  Merge branch 'ci-runners-master-or-owner' into 'master' · 9a3df9d5
  由 Dmitriy Zaporozhets 提交于 11月 16, 2015
```
Show specific runners from projects where user is master or owner

This fix for permission escalation when handling specific runners.

The users were allowed to assign runners from projects where they were guests.


See merge request !1809
```
  9a3df9d5
- M
  
  Add unique to oid index for lfs object. · 84c71e5d
  由 Marin Jankovski 提交于 11月 16, 2015
  
  84c71e5d