Commits · 581cfbae24d629433e2e4eb6f6a2bb2a2938cada · 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

Dec 26, 2016
- Fix MR with files hidden by .gitattributes · 1e5e56c6
  Sean McGivern authored 8 years ago
  1e5e56c6
Dec 02, 2016
- Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass · f5d7a617
  Valery Sizov authored 8 years ago
  
  f5d7a617
Nov 28, 2016
- Use assigned variables better · 87665170
  Sean McGivern authored 8 years ago
  
  87665170
Nov 25, 2016
- Add keyword arguments to truncated_diff method · a761c59a
  hhoopes authored 8 years ago
  a761c59a
- Change diff highlight/truncate for reusability · f928dba9
  hhoopes authored 8 years ago
  f928dba9
- Fix: Timeout creating and viewing merge request for binary file · 847ada36
  Valery Sizov authored 8 years ago
  
  847ada36
Nov 14, 2016
- Fix Error 500 when creating a merge request that contains an image that was deleted and added · 0f61bb2d
  Stan Hu authored 8 years ago
  0f61bb2d
Nov 10, 2016
- Fix expanding a collapsed diff when converting a symlink to a regular file · 3fa265d1
  Adam Niedzielski authored 8 years ago
  3fa265d1
Oct 17, 2016
- Fix the diff in the merge request view when converting a symlink to a regular file. · 317e4819
  Adam Niedzielski authored 8 years ago
  317e4819
Aug 19, 2016
- Fix line commenting for the initial commit · 4a4c1765
  Sean McGivern authored 8 years ago
  4a4c1765
Aug 15, 2016
- Make merge request diff works with new FileCollection logic · 643a368f
  Dmitriy Zaporozhets authored 8 years ago
  643a368f
Aug 12, 2016
- Fix specs · 261d47bc
  Sean McGivern authored 8 years ago
  261d47bc
- Auto-highlight conflict when rich_text is called · 7af277f6
  Sean McGivern authored 8 years ago
  
  7af277f6
- Add backend for merge conflicts reading · df2ed097
  Sean McGivern authored 8 years ago
  
  df2ed097
Aug 03, 2016
- switch from diff_file_collection to diffs · c86c1905
  Paco Guzman authored 8 years ago
  c86c1905
- Introduce Compare model in the codebase. · 1d0c7b74
  Paco Guzman authored 8 years ago
  1d0c7b74
- 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 20, 2016
- Add Discussion model to represent MR/diff discussion · 79214be7
  Douwe Maan authored 8 years ago
  
  79214be7
- Ensure to_json methods take optional argument · 4f0780cc
  Sean McGivern authored 8 years ago
  
  4f0780cc
Jul 19, 2016
- Fix method visibility in inline diff class · 20a5033d
  Grzegorz Bizon authored 8 years ago
  
  20a5033d
Jul 18, 2016
- Collapsed diffs lines/size don't accumulate to overflow diffs. · a404ab38
  Paco Guzman authored 8 years ago
  
  a404ab38
Jul 13, 2016
- Actually render old and new sections of parallel diff next to each other · 545a85dc
  Douwe Maan authored 8 years ago
  
  545a85dc
- Rename constant to be more descriptive · 489e1937
  Douwe Maan authored 8 years ago
  
  489e1937
Jul 12, 2016
- Extended regexes ignore whitespace, so use \s · e981d6cd
  Douwe Maan authored 8 years ago
  
  e981d6cd
Jul 11, 2016
- Render inline diffs for multiple changed lines following eachother · f5cc3f63
  Douwe Maan authored 8 years ago
  
  f5cc3f63
Jul 08, 2016
- Collapse large diffs by default · b6b26692
  Sean McGivern authored 8 years ago
  b6b26692
Jul 06, 2016
- Remove duplication, unused methods, and some other style things · ac26b237
  Douwe Maan authored 8 years ago
  
  ac26b237
- Add some more code comments. · 228d2a4c
  Douwe Maan authored 8 years ago
  
  228d2a4c
- Display new diff notes and allow creation through the web interface · 29d57486
  Douwe Maan authored 8 years ago
  
  29d57486
- Add Gitlab::Git::PositionTracer · db65954d
  Douwe Maan authored 8 years ago
  
  db65954d
- Add Gitlab::Diff::LineMapper · e9e06ca6
  Douwe Maan authored 8 years ago
  
  e9e06ca6
- Add Gitlab::Git::Position · 9abcc0a9
  Douwe Maan authored 8 years ago
  
  9abcc0a9
- Extract parts of LegacyDiffNote into DiffOnNote concern and move part of... · a27462a5
  Douwe Maan authored 8 years ago
  a27462a5
- Style diff and blob file headers the same way · 37519345
  Douwe Maan authored 8 years ago
  
  37519345
- Add DiffFile#blob and #old_blob · 9fc0e11e
  Douwe Maan authored 8 years ago
  
  9fc0e11e
- Represent DiffRefs as proper class instead of tuple array · a9fa45f0
  Douwe Maan authored 8 years ago
  
  a9fa45f0
Jul 01, 2016
- Enable Style/EmptyLines cop, remove redundant ones · 9e211091
  Grzegorz Bizon authored 8 years ago
  
  9e211091
Jun 03, 2016
- 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