提交 · 061dd18b762c25cff8e95ab6012f346fdccac09a · 李少辉-开发者 / gitlab-foss

03 10月, 2016 1 次提交
- T
  Add a /wip slash command · ddbe676d
  由 Thomas Balthazar 提交于 9月 08, 2016
```
It toggles the 'WIP' prefix in the MR title.
```
  ddbe676d
30 9月, 2016 5 次提交
- K
  
  Change callback · 57229f48
  由 Katarzyna Kobierska 提交于 9月 29, 2016
  
  57229f48
- K
  
  Callback close_merge_request_without_source_project · 13d2ec2d
  由 Katarzyna Kobierska 提交于 9月 26, 2016
  
  13d2ec2d
- K
  
  Improve grammar · 1b547cfb
  由 Katarzyna Kobierska 提交于 9月 23, 2016
  
  1b547cfb
- K
  
  Close merge request if open without source project · 25edb070
  由 Katarzyna Kobierska 提交于 9月 22, 2016
  
  25edb070
- T
  
  Close todos when accepting a MR via the API. · 6d49fcf4
  由 Tony Gambone 提交于 9月 22, 2016
  
  6d49fcf4
22 9月, 2016 1 次提交
- R
  Revert part of "Merge branch 'update_issues_mr_counter' into 'master' · d4e91b22
  由 Rémy Coutable 提交于 9月 22, 2016
```
Signed-off-by: NRémy Coutable <remy@rymai.me>
```
  d4e91b22
20 9月, 2016 1 次提交
- B
  
  fix issues mr counter · 418e95bd
  由 barthc 提交于 6月 27, 2016
  
  418e95bd
16 9月, 2016 1 次提交
- K
  
  Render invalid template for merge requests without source project and open · 63493944
  由 Katarzyna Kobierska 提交于 9月 16, 2016
  
  63493944
13 9月, 2016 2 次提交
- K
  
  Add test checking method closed_without_source_project · 81da7f13
  由 Katarzyna Kobierska 提交于 9月 05, 2016
  
  81da7f13
- K
  
  Checks if deleting forked project closed all open merge requests · 09cded29
  由 Katarzyna Kobierska 提交于 9月 02, 2016
  
  09cded29
07 9月, 2016 5 次提交
- D
  Refactor compared_diff_version method in merge requests controller · d41fc61f
  由 Dmitriy Zaporozhets 提交于 9月 07, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d41fc61f
- D
  Refactor merge request version compare feature · 6f7a3ee6
  由 Dmitriy Zaporozhets 提交于 9月 07, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6f7a3ee6
- D
  Improve merge request version feature · 5f0535ac
  由 Dmitriy Zaporozhets 提交于 9月 06, 2016
```
* Use version numbers instead of sha as more user-friendly
* Make it clear that we compare later version (left) with older one (right)
* Improve wording of version switch panel
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f0535ac
- D
  Refactor code for merge request version compare feature · aacb4caf
  由 Dmitriy Zaporozhets 提交于 9月 01, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aacb4caf
- D
  Compare merge request version against other version on changes page · 8b2e065b
  由 Dmitriy Zaporozhets 提交于 8月 31, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8b2e065b
01 9月, 2016 1 次提交
- F
  
  Project tools visibility level · 892dea67
  由 Felipe Artur 提交于 8月 01, 2016
  
  892dea67
25 8月, 2016 1 次提交

Add code improvements to merge request version feature · d64c15c5

由 Dmitriy Zaporozhets 提交于 8月 25, 2016

* Add MergeRequestDiff#latest?
* Remove unnecessary variable assignment
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

d64c15c5

22 8月, 2016 2 次提交
- V
  
  Revert the revert of Optimistic Locking · 8f9a7ca8
  由 Valery Sizov 提交于 8月 01, 2016
  
  8f9a7ca8
- D
  Disable comments on older merge request diff · 7b3fd816
  由 Dmitriy Zaporozhets 提交于 8月 22, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7b3fd816
19 8月, 2016 1 次提交
- D
  
  Improve performance of MR show page · 6a355d45
  由 Douwe Maan 提交于 8月 18, 2016
  
  6a355d45
18 8月, 2016 2 次提交
- R
  
  Refactor to mark Changes tab as active on new MR page. · 22ce76d4
  由 Ruben Davila 提交于 8月 18, 2016
  
  22ce76d4
- A
  
  Fix tabs navigation and do not update URL via pushstate · 43252ccb
  由 Alfredo Sumaran 提交于 8月 17, 2016
  
  43252ccb
15 8月, 2016 1 次提交
- D
  Make merge request diff works with new FileCollection logic · 643a368f
  由 Dmitriy Zaporozhets 提交于 8月 15, 2016
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  643a368f
13 8月, 2016 16 次提交
- D
  
  Fix autocomplete on commit and issue/MR edit pages · ccd44546
  由 Douwe Maan 提交于 8月 12, 2016
  
  ccd44546
- D
  
  Use a regular flash message after resolution is complete · 83925ef4
  由 Douwe Maan 提交于 8月 10, 2016
  
  83925ef4
- D
  Prevent “This merge request contains merge conflicts” from being shown after... · 1711a384
  由 Douwe Maan 提交于 8月 10, 2016
```
Prevent “This merge request contains merge conflicts” from being shown after resolution because of slow background workers
```
  1711a384
- D
  
  Get conflict resolution to work for MRs from forks · 8dba8e2d
  由 Douwe Maan 提交于 8月 10, 2016
  
  8dba8e2d
- D
  
  Show appropriate message when conflicts have already been resolved · 5e1e08e5
  由 Douwe Maan 提交于 8月 10, 2016
  
  5e1e08e5
- D
  
  Verify user is signed in and can actually resolve conflicts · 9eca67c9
  由 Douwe Maan 提交于 8月 10, 2016
  
  9eca67c9
- D
  
  Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?` · cf4cbb01
  由 Douwe Maan 提交于 8月 10, 2016
  
  cf4cbb01
- S
  
  Add more tests for conflicts · ce7eb4e4
  由 Sean McGivern 提交于 8月 05, 2016
  
  ce7eb4e4
- S
  
  Set flash message after conflict is resolved · f322c302
  由 Sean McGivern 提交于 8月 04, 2016
  
  f322c302
- S
  Remove undo endpoint · 46f8e642
  由 Sean McGivern 提交于 8月 04, 2016
```
This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
```
  46f8e642
- S
  
  Move resolving code to ResolveService · ba327e69
  由 Sean McGivern 提交于 8月 04, 2016
  
  ba327e69
- S
  Don't allow resolving invalid conflicts · 427e7246
  由 Sean McGivern 提交于 8月 04, 2016
```
An MR can only be resolved in the UI if:
- It has conflicts.
- It has valid diff_refs (in other words, it supports new diff notes).
- It has no conflicts with one side missing.
- It has no conflicts in binary files.
- It has no conflicts in files too large to display.
- It has no conflicts containing invalid conflict markers.
```
  427e7246
- S
  
  Fix resolve_conflicts endpoint · 3cc07e7e
  由 Sean McGivern 提交于 8月 02, 2016
  
  3cc07e7e
- S
  
  Make SCSS lint and RuboCop happy · 76cd67b0
  由 Sean McGivern 提交于 8月 02, 2016
  
  76cd67b0
- F
  
  Render right sidebar and handle request error. · c2295fbd
  由 Fatih Acet 提交于 8月 02, 2016
  
  c2295fbd
- S
  
  Handle case where one side deleted the file · f3cf40b8
  由 Sean McGivern 提交于 8月 01, 2016
  
  f3cf40b8