Commits · ddbe676dc318b87c3d656a08bbf5d75485ad544b · jt-gitlab / GitLab Community Edition · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Oct 03, 2016
- Add a /wip slash command · ddbe676d
  Thomas Balthazar authored 8 years ago
  ddbe676d
Sep 30, 2016
- Change callback · 57229f48
  Katarzyna Kobierska authored 8 years ago
  
  57229f48
- Callback close_merge_request_without_source_project · 13d2ec2d
  Katarzyna Kobierska authored 8 years ago
  
  13d2ec2d
- Improve grammar · 1b547cfb
  Katarzyna Kobierska authored 8 years ago
  
  1b547cfb
- Close merge request if open without source project · 25edb070
  Katarzyna Kobierska authored 8 years ago
  
  25edb070
Sep 29, 2016
- Close todos when accepting a MR via the API. · 6d49fcf4
  Tony Gambone authored 8 years ago
  
  6d49fcf4
Sep 22, 2016
- Revert part of "Merge branch 'update_issues_mr_counter' into 'master' · d4e91b22
  Rémy Coutable authored 8 years ago
  Verified
  
  d4e91b22
Sep 20, 2016
- fix issues mr counter · 418e95bd
  barthc authored 8 years ago
  
  418e95bd
Sep 16, 2016
- Render invalid template for merge requests without source project and open · 63493944
  Katarzyna Kobierska authored 8 years ago
  
  63493944
Sep 13, 2016
- Add test checking method closed_without_source_project · 81da7f13
  Katarzyna Kobierska authored 8 years ago
  
  81da7f13
- Checks if deleting forked project closed all open merge requests · 09cded29
  Katarzyna Kobierska authored 8 years ago
  
  09cded29
Sep 07, 2016
- Refactor compared_diff_version method in merge requests controller · d41fc61f
  Dmitriy Zaporozhets authored 8 years ago
  d41fc61f
- Refactor merge request version compare feature · 6f7a3ee6
  Dmitriy Zaporozhets authored 8 years ago
  6f7a3ee6
- Improve merge request version feature · 5f0535ac
  Dmitriy Zaporozhets authored 8 years ago
  5f0535ac
- Refactor code for merge request version compare feature · aacb4caf
  Dmitriy Zaporozhets authored 8 years ago
  aacb4caf
- Compare merge request version against other version on changes page · 8b2e065b
  Dmitriy Zaporozhets authored 8 years ago
  8b2e065b
Sep 01, 2016
- Project tools visibility level · 892dea67
  Felipe Artur authored 8 years ago
  
  892dea67
Aug 25, 2016
- Add code improvements to merge request version feature · d64c15c5
  Dmitriy Zaporozhets authored 8 years ago
  Verified
  
  d64c15c5
Aug 22, 2016
- Revert the revert of Optimistic Locking · 8f9a7ca8
  Valery Sizov authored 8 years ago
  
  8f9a7ca8
- Disable comments on older merge request diff · 7b3fd816
  Dmitriy Zaporozhets authored 8 years ago
  Verified
  
  7b3fd816
Aug 19, 2016
- Improve performance of MR show page · 6a355d45
  Douwe Maan authored 8 years ago
  
  6a355d45
Aug 18, 2016
- Refactor to mark Changes tab as active on new MR page. · 22ce76d4
  Ruben Davila authored 8 years ago
  
  22ce76d4
- Fix tabs navigation and do not update URL via pushstate · 43252ccb
  Alfredo Sumaran authored 8 years ago
  
  43252ccb
Aug 15, 2016
- Make merge request diff works with new FileCollection logic · 643a368f
  Dmitriy Zaporozhets authored 8 years ago
  Verified
  
  643a368f
Aug 13, 2016
- Fix autocomplete on commit and issue/MR edit pages · ccd44546
  Douwe Maan authored 8 years ago
  
  ccd44546
Aug 12, 2016
- Use a regular flash message after resolution is complete · 83925ef4
  Douwe Maan authored 8 years ago
  
  83925ef4
- Prevent “This merge request contains merge conflicts” from being shown after... · 1711a384
  Douwe Maan authored 8 years ago
  1711a384
- Get conflict resolution to work for MRs from forks · 8dba8e2d
  Douwe Maan authored 8 years ago
  
  8dba8e2d
- Show appropriate message when conflicts have already been resolved · 5e1e08e5
  Douwe Maan authored 8 years ago
  
  5e1e08e5
- Verify user is signed in and can actually resolve conflicts · 9eca67c9
  Douwe Maan authored 8 years ago
  
  9eca67c9
- Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?` · cf4cbb01
  Douwe Maan authored 8 years ago
  
  cf4cbb01
- Add more tests for conflicts · ce7eb4e4
  Sean McGivern authored 8 years ago
  
  ce7eb4e4
- Set flash message after conflict is resolved · f322c302
  Sean McGivern authored 8 years ago
  
  f322c302
- Remove undo endpoint · 46f8e642
  Sean McGivern authored 8 years ago
  46f8e642
- Move resolving code to ResolveService · ba327e69
  Sean McGivern authored 8 years ago
  
  ba327e69
- Don't allow resolving invalid conflicts · 427e7246
  Sean McGivern authored 8 years ago
  427e7246
- Fix resolve_conflicts endpoint · 3cc07e7e
  Sean McGivern authored 8 years ago
  
  3cc07e7e
- Make SCSS lint and RuboCop happy · 76cd67b0
  Sean McGivern authored 8 years ago
  
  76cd67b0
- Render right sidebar and handle request error. · c2295fbd
  Fatih Acet authored 8 years ago
  
  c2295fbd
- Handle case where one side deleted the file · f3cf40b8
  Sean McGivern authored 8 years ago
  
  f3cf40b8