提交 · 61fcb3c568d6c7f5a780d9feff5d9d5a2d83a84d · 李少辉-开发者 / gitlab-foss

23 10月, 2015 1 次提交
- V
  
  Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork · 95df8663
  由 Valery Sizov 提交于 10月 22, 2015
  
  95df8663
20 10月, 2015 1 次提交
- D
  
  Correctly find last known blob for file deleted in MR. · 8710739e
  由 Douwe Maan 提交于 10月 20, 2015
  
  8710739e
16 10月, 2015 2 次提交
- Z
  
  Only accept open issues and merge requests · 94a788f6
  由 Zeger-Jan van de Weg 提交于 10月 13, 2015
  
  94a788f6
- Z
  
  Show merge requests which close current issue · 9f9f0c35
  由 Zeger-Jan van de Weg 提交于 10月 12, 2015
  
  9f9f0c35
09 10月, 2015 1 次提交
- B
  
  merge_request: add work_in_progress to MR hooks · 6b739027
  由 Ben Boeckel 提交于 9月 25, 2015
  
  6b739027
08 10月, 2015 1 次提交
- B
  
  merge_request: coerce work_in_progress? into a boolean · 38039221
  由 Ben Boeckel 提交于 9月 30, 2015
  
  38039221
21 9月, 2015 1 次提交

Fetch merge request ref if it is missing when visit MR page · 3a001a92

由 Dmitriy Zaporozhets 提交于 9月 21, 2015

This will fix merge problem for merge requests between forks created
before 8.0
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3a001a92

06 9月, 2015 1 次提交
- S
  
  Re-annotate models · d7812a95
  由 Stan Hu 提交于 9月 06, 2015
  
  d7812a95
11 8月, 2015 5 次提交
- D
  Revert "Merge branch 'revert-satellites' into 'master' · 3e259ea8
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 5daf44b7, reversing
changes made to 2f706fbd.
```
  3e259ea8
- D
  Revert "Merge branches inside one repository using rugged instead of satellites" · 3b02ad84
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit d24c40ec.
```
  3b02ad84
- D
  Revert "Merge branch 'refactor-can-be-merge' into 'master'" · 32046983
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 459e6d34, reversing
changes made to 804168e1.
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32046983
- D
  Revert "Merge branch 'drop-satellites'" · 9f10943c
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 957e849f, reversing
changes made to 6b9dbe9f.
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9f10943c
- D
  Revert "Merge branch 'improve-merge-requests' into 'master' · 84727fba
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 4773f38e, reversing
changes made to 0d5d80b7.
```
  84727fba
07 8月, 2015 1 次提交
- D
  Fetch to mr code from fork to iid · 8dce6623
  由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8dce6623
22 7月, 2015 1 次提交
- D
  
  Fix Remove source-branch for MRs from same project · 276ca427
  由 Douwe Maan 提交于 7月 22, 2015
  
  276ca427
16 7月, 2015 1 次提交
- D
  Huge refactoring for accepting merge requests · a7fded9b
  由 Dmitriy Zaporozhets 提交于 7月 16, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a7fded9b
15 7月, 2015 3 次提交
- D
  
  Refactor compare and fetch logic · 26f5d604
  由 Dmitriy Zaporozhets 提交于 7月 15, 2015
  
  26f5d604
- D
  
  Implement merge from forks without satellites · 2a6f522c
  由 Dmitriy Zaporozhets 提交于 7月 15, 2015
  
  2a6f522c
- D
  
  Remove satellites · a87989fb
  由 Dmitriy Zaporozhets 提交于 7月 15, 2015
  
  a87989fb
01 7月, 2015 2 次提交
- D
  Refactor can_be_merged logic for merge request · 2e6bbb12
  由 Dmitriy Zaporozhets 提交于 7月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2e6bbb12
- D
  Merge branches inside one repository using rugged instead of satellites · d24c40ec
  由 Dmitriy Zaporozhets 提交于 7月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d24c40ec
19 6月, 2015 1 次提交

Revert merge request states renaming · 7524d7c0

由 Dmitriy Zaporozhets 提交于 6月 18, 2015

Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

7524d7c0

12 6月, 2015 1 次提交
- D
  Improve variables in mr widget · 946b4ced
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  946b4ced
11 6月, 2015 1 次提交
- D
  Refactor accept merge request widget · 644b6ba9
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  644b6ba9
29 5月, 2015 1 次提交

Support editing target branch of merge request · 5e4384ec

由 Stan Hu 提交于 5月 28, 2015

Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130

5e4384ec

27 5月, 2015 4 次提交
- R
  
  Surround Project.reference_pattern in parenthesis inside other patterns · 1a9da917
  由 Robert Speicher 提交于 5月 15, 2015
  
  1a9da917
- R
  
  Add `reference_pattern` to Referable models · b88da58c
  由 Robert Speicher 提交于 5月 14, 2015
  
  b88da58c
- R
  Implement gfm_reference directly in Mentionable · 0359d41b
  由 Robert Speicher 提交于 5月 11, 2015
```
Except for Note, which still overrides it.
```
  0359d41b
- R
  Add `to_reference` for models that support references · c0faf91f
  由 Robert Speicher 提交于 5月 02, 2015
```
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
```
  c0faf91f
25 5月, 2015 1 次提交
- D
  
  Consistently refer to MRs as either Accepted or Rejected. · ebe9c890
  由 Douwe Maan 提交于 5月 25, 2015
  
  ebe9c890
30 4月, 2015 1 次提交
- D
  
  Don't allow a merge request to be merged when its title starts with "WIP". · 7e0eb486
  由 Douwe Maan 提交于 4月 30, 2015
  
  7e0eb486
24 4月, 2015 2 次提交
- D
  
  Select MR commit notes from source project. · 4f2e4c76
  由 Douwe Maan 提交于 4月 21, 2015
  
  4f2e4c76
- D
  
  No longer needed to pass project argument to commit methods. · 27af24c1
  由 Douwe Maan 提交于 4月 21, 2015
  
  27af24c1
15 4月, 2015 1 次提交
- B
  fix stuck mr · f517dd26
  由 Ben Bodenmiller 提交于 4月 14, 2015
```
fixes #348. related to 64874193.
```
  f517dd26
14 4月, 2015 2 次提交
- D
  Revert "Merge branch 'fix-stuck-mr' into 'master'" · ae6d0aaa
  由 Douwe Maan 提交于 4月 14, 2015
```
This reverts commit 79b4d0b0, reversing
changes made to a1e147ce.
```
  ae6d0aaa
- B
  fix stuck MR · fb1cd0a8
  由 Ben Bodenmiller 提交于 4月 14, 2015
```
fixes #348. related to 64874193.
```
  fb1cd0a8
04 4月, 2015 1 次提交
- D
  
  Refactor ClosingIssueExtractor. · e33ddfeb
  由 Douwe Maan 提交于 4月 03, 2015
  
  e33ddfeb
02 4月, 2015 1 次提交
- D
  
  Only allow users to cross-reference and close issues they have access to. · 65bb0c34
  由 Douwe Maan 提交于 3月 27, 2015
  
  65bb0c34
24 3月, 2015 1 次提交
- D
  
  Don't mark merge request as updated when merge status relative to target branch changes. · 70fa9d56
  由 Douwe Maan 提交于 3月 23, 2015
  
  70fa9d56
20 3月, 2015 1 次提交

Update merge_status state to allow more transitions · 41551791

由 DJ Mountney 提交于 3月 19, 2015

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

41551791