Commits · f2f844693ecd8a10d48530adf8d59a7c125d2752 · 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

Aug 12, 2016
- Handle conflict resolution errors in controller · f2f84469
  Sean McGivern authored 8 years ago
  
  f2f84469
- Allow resolving conflicts in MR controller · 14a4b17d
  Sean McGivern authored 8 years ago
  
  14a4b17d
- Handle multiple merge conflict files in collection · a1c79612
  Sean McGivern authored 8 years ago
  
  a1c79612
Aug 09, 2016
- fixes part1 of files to start using active tense · 519275c1
  tiagonbotelho authored 8 years ago
  
  519275c1
Aug 03, 2016
- Move to Gitlab::Diff::FileCollection · 8f359ea9
  Paco Guzman authored 8 years ago
  8f359ea9
- Cache highlighted diff lines for merge requests · cd7c2cb6
  Paco Guzman authored 8 years ago
  cd7c2cb6
Jul 11, 2016
- Support renames in diff_for_path actions · 5266ae87
  Sean McGivern authored 8 years ago
  
  5266ae87
Jul 08, 2016
- Tidy up spec action names · e462e122
  Sean McGivern authored 8 years ago
  
  e462e122
- Collapse large diffs by default · b6b26692
  Sean McGivern authored 8 years ago
  b6b26692
Jul 06, 2016
- Add send_git_patch helper · ddec2ed0
  Douwe Maan authored 8 years ago
  
  ddec2ed0
- Rename MergeRequest methods that return commits or shas to be more clear and consistent · 6ce25e7b
  Douwe Maan authored 8 years ago
  
  6ce25e7b
Jul 01, 2016
- Enable Style/EmptyLines cop, remove redundant ones · 9e211091
  Grzegorz Bizon authored 8 years ago
  
  9e211091
Jun 28, 2016
- Workhorse to serve email diffs · c31f876a
  Zeger-Jan van de Weg authored 8 years ago
  c31f876a
Jun 27, 2016
- Use HTTP matchers if possible · abca19da
  Zeger-Jan van de Weg authored 8 years ago
  
  abca19da
Jun 24, 2016
- Fix a wrong MR status when merge_when_build_succeeds &... · e3d464d8
  Rémy Coutable authored 8 years ago
  Verified
  
  e3d464d8
Jun 03, 2016
- Workhorse to serve raw diffs · 01e1139f
  Zeger-Jan van de Weg authored 8 years ago and Zeger-Jan van de Weg committed 8 years ago
  
  01e1139f
- Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features · 20c7144e
  Kamil Trzcinski authored 8 years ago
  
  20c7144e
- Revert "Fix merge conflicts - squashed commit" · 721014c9
  James Lopez authored 8 years ago
  721014c9
- Fix merge conflicts - squashed commit · 3e991230
  James Lopez authored 8 years ago
  3e991230
Jun 01, 2016
- Don't allow merges with new commits · f680eca9
  Sean McGivern authored 8 years ago
  f680eca9
May 30, 2016
- Enable Style/RedundantParentheses rubocop cop · c370dce0
  Grzegorz Bizon authored 8 years ago
  c370dce0
Apr 19, 2016
- Clarify that the diff view setting always comes from the cookie · 8530ce4c
  Robert Speicher authored 8 years ago
  8530ce4c
Apr 12, 2016
- Add changelog entry, improve specs and model code · a64f1c76
  Felipe Artur authored 8 years ago
  
  a64f1c76
Apr 11, 2016
- Allow to close invalid merge request · 476cf23f
  Felipe Artur authored 8 years ago
  
  476cf23f
Mar 30, 2016
- Fixed MergeRequestController spec · 808bcf5b
  Gabriel Mazetto authored 9 years ago
  
  808bcf5b
Mar 21, 2016
- Minor improvements on IssuableActions · 3b088fc5
  Zeger-Jan van de Weg authored 9 years ago
  
  3b088fc5
Mar 19, 2016
- minor improvements and fixed specs · 1d778228
  Zeger-Jan van de Weg authored 9 years ago
  
  1d778228
- Dry destroy action on issuables · 7342a456
  Zeger-Jan van de Weg authored 9 years ago
  
  7342a456
- Soft delete issuables · 212e83ba
  Zeger-Jan van de Weg authored 9 years ago
  
  212e83ba
Feb 18, 2016
- Reopened MRs should also be considered as open. · 2770de96
  Rubén Dávila authored 9 years ago
  
  2770de96
Feb 05, 2016
- Add spec for assigning view param from cookie · 551ce0f2
  Robert Speicher authored 9 years ago
  
  551ce0f2
- Add a controller test for the new 'diff_view' cookie · f6d816f9
  Rémy Coutable authored 9 years ago
  
  f6d816f9
Dec 04, 2015
- Fix 500 error when creating a merge request that removes a submodule · 12fdc13a
  Douglas Barbosa Alexandre authored 9 years ago
  
  12fdc13a
Nov 13, 2015
- Add ignore white space option in merge request diff · 3d0efa8e
  Minsik Yoon authored 9 years ago
  3d0efa8e
Jun 23, 2015
- Fix Style/AlignHash cop violations · 359ed486
  Stan Hu authored 9 years ago
  
  359ed486
Jun 22, 2015
- Change `to_not` calls to `not_to` · bf71d53f
  Robert Speicher authored 9 years ago
  bf71d53f
Jun 17, 2015
- Load the Merge Request > Commits tab lazily · bc027c51
  Robert Speicher authored 9 years ago
  
  bc027c51
- Move Projects::MergeRequestsController spec to its correct location · 5c78d7fc
  Robert Speicher authored 9 years ago
  
  5c78d7fc
Apr 28, 2015
- Fix "Revspec not found" errors when viewing diffs in a forked project with submodules · 72a7febe
  Stan Hu authored 9 years ago
  72a7febe
Feb 14, 2015
- Upgrade to Rails 4.1.9 · 76aad9b7
  Vinnie Okada authored 10 years ago
  76aad9b7