Commits · be4359efba514095cda25c225495b55f92a01f45 · Forest Godfrey / gitlab-ce

09 Sep, 2014 1 commit

Merge branch 'refactor-diff-yeild' into 'parallel_diff_refactor' · be4359ef

authored Sep 09, 2014

Refactor diffs

This refactoring done on top of Marin improvements to side-by-side diff.
Main target of this refactoring is to reduce mess and increase test coverage.

1. Use objects:
  * Gitlab::Diff::Line for line change in diff
  * Gitlab::Diff::File for file changes (diff + blob info)
2. Avoid `yield` magic
3. Move logic from views/helper to models/libs
4. Move diff views under separate dir `app/views/projects/diffs`

See merge request !1072

be4359ef

08 Sep, 2014 20 commits
- Fix usage of diff file mode change · 93dc8855
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  93dc8855
- optimize show_diff_size_warning? · 02e87d92
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  02e87d92
- Refactoring inside refactoring. We need to go deeper · 218219ab
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  218219ab
- Specs for diff parser! Yay! · bde3f25d
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bde3f25d
- Fix all broken stuff after diff refactoring · c741fcab
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c741fcab
- Use new diff parsing logic · 531f16be
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  531f16be
- Refactor diff views · e0eb4803
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e0eb4803
- Gitlab::Diff classes added · 4ef809c7
  Dmitriy Zaporozhets authored Sep 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ef809c7
- Cleanup · 205358b1
  Marin Jankovski authored Sep 08, 2014
  
  205358b1
- Now refactor all to work properly. · 23706716
  Marin Jankovski authored Sep 06, 2014
  
  23706716
- Color the lines correctly. · 13cfa49a
  Marin Jankovski authored Sep 05, 2014
  
  13cfa49a
- Don't show the line numbers if the lines were removed. · 7d45624d
  Marin Jankovski authored Sep 05, 2014
  
  7d45624d
- Take the next type into consideration · 721b7573
  Marin Jankovski authored Sep 04, 2014
  
  721b7573
- Coloring. · dc7554d0
  Marin Jankovski authored Sep 04, 2014
  
  dc7554d0
- Take added or removed file into account. · 75b04a17
  Marin Jankovski authored Sep 04, 2014
  
  75b04a17
- File mode changed note. · 357bf009
  Marin Jankovski authored Sep 04, 2014
  
  357bf009
- Remove duplication, expand for next_line. · f827482c
  Marin Jankovski authored Sep 04, 2014
  
  f827482c
- Duplicate the behaviour and refactor for use with parallel diff. · 1067b007
  Marin Jankovski authored Sep 04, 2014
  
  1067b007
- Parallel diff in two columns. · b54f2393
  Marin Jankovski authored Sep 03, 2014
  
  b54f2393
- Merge pull request #7596 from bbodenmiller/patch-5 · de6f4c31
  Dmitriy Zaporozhets authored Sep 08, 2014
```
add current sign-in date
```
  de6f4c31
07 Sep, 2014 1 commit
- Merge pull request #7696 from Zyphrax/master · f42a1ded
  Dmitriy Zaporozhets authored Sep 07, 2014
```
Prevent graph spacing issue
```
  f42a1ded
06 Sep, 2014 6 commits
- Merge pull request #7704 from randx/sample-fork-pr · d8cbff3f
  Dmitriy Zaporozhets authored Sep 06, 2014
```
Switch from travis to semaphoreapp
```
  d8cbff3f
- Switch from travis to semaphore · 4585ae37
  Dmitriy Zaporozhets authored Sep 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4585ae37
- Semaphoreapp badge · 56b08c7e
  Dmitriy Zaporozhets authored Sep 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  56b08c7e
- Fix tests for CI · 9f505954
  Dmitriy Zaporozhets authored Sep 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9f505954
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · bf5fb04e
  Dmitriy Zaporozhets authored Sep 06, 2014
  
  bf5fb04e
- Remove parent spacing. Fixes #7505 · 1f355279
  Yvo van Beek authored Sep 06, 2014
  
  1f355279
05 Sep, 2014 11 commits
- Merge pull request #7699 from mmrvka/master-pkgr · 4034851c
  Robert Schilling authored Sep 05, 2014
```
Added cmake and pkg-config as build dependency for pkgr
```
  4034851c
- Added cmake and pkg-config as build dependency for pkgr · 20d0d5a7
  Martin Mrvka authored Sep 02, 2014
  
  20d0d5a7
- Merge branch 'mr-push-note' into 'master' · e77ba96f
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Add comment to merge request when new push happens

Fixes #1494

See merge request !1065
```
  e77ba96f
- Pluralize commit text for note when push to existing MR · fd6b7b4a
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd6b7b4a
- Add comment to merge request when new push happens · b0b05aa2
  Dmitriy Zaporozhets authored Sep 05, 2014
```
It allows track when user added new commits to existing merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b0b05aa2
- Merge pull request #7193 from dloman/master · 17678738
  Dmitriy Zaporozhets authored Sep 05, 2014
```
added htmlsafe to branch list
```
  17678738
- Merge pull request #7470 from bbodenmiller/patch-1 · e088777e
  Dmitriy Zaporozhets authored Sep 05, 2014
```
change git to git bin path
```
  e088777e
- Merge pull request #7252 from unaheidi/master · cd8503e3
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Delete mailer queue
```
  cd8503e3
- Merge pull request #7658 from Razer6/refresh_labels_page_on_delete · 60a98584
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Show labels help message if last label is deleted
```
  60a98584
- Fix tests by using non-exist tag names · 3a971ca9
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a971ca9
- Fix tag tests · 3162140d
  Dmitriy Zaporozhets authored Sep 05, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3162140d
04 Sep, 2014 1 commit
- Show labels help message if last label is deleted · bd235519
  Robert Schilling authored Sep 01, 2014
  
  bd235519