| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | Added documentation for GitLab Metrics | Yorick Peterse | 2016-01-18 | 5 | -0/+245 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'fix-github-pull-requests-import' into 'master' | Robert Speicher | 2016-01-20 | 2 | -10/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523 | |||||
| | * | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests | Douglas Barbosa Alexandre | 2016-01-20 | 2 | -10/+23 | |
| | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'issue_3945' into 'master' | Robert Speicher | 2016-01-20 | 49 | -392/+1151 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax highlighting to diff view Closes #3945 See merge request !2109 | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 10 | -0/+241 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Use a MR with commits. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 31 | -32/+159 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Validate bounds just to be sure | Douwe Maan | 2016-01-20 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 5 | -7/+24 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 10 | -32/+75 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Update tests | Douwe Maan | 2016-01-20 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix MR diff_refs | Douwe Maan | 2016-01-20 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Properly handle HTML entities with inline diffs | Douwe Maan | 2016-01-20 | 5 | -20/+24 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Restore helper | Douwe Maan | 2016-01-20 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 132 | -275/+1031 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 8 | -127/+148 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Check if MR is not broken. | Rubén Dávila | 2016-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add missing specs | Douwe Maan | 2016-01-19 | 1 | -0/+21 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't crash when file can't be highlighted | Douwe Maan | 2016-01-19 | 1 | -9/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Refactor Gitlab::Highlight and fix tests | Douwe Maan | 2016-01-19 | 7 | -135/+131 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Remove useless assignments | Douwe Maan | 2016-01-19 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add tests | Douwe Maan | 2016-01-15 | 4 | -0/+53 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Whoops, forgot to add files | Douwe Maan | 2016-01-15 | 2 | -0/+160 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move inline diff marker logic to its own class | Douwe Maan | 2016-01-15 | 1 | -95/+11 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move inline diff logic to its own class | Douwe Maan | 2016-01-15 | 1 | -73/+11 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Method was moved | Douwe Maan | 2016-01-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 665 | -4235/+10115 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | More refactoring from last code review. #3945 | Rubén Dávila | 2016-01-14 | 14 | -296/+366 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs | |||||
| | * | | | | | | | | | | | | | | | | Use the adequate reference for the old rev. #3945 | Rubén Dávila | 2016-01-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Add inline diff markers in highlighted diffs. | Douwe Maan | 2016-01-14 | 7 | -40/+187 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Refactor highlighting lines | Douwe Maan | 2016-01-14 | 1 | -25/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Remove duplication around highlighting. | Douwe Maan | 2016-01-14 | 3 | -27/+25 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Refactor parallel_diff generation a bit. | Douwe Maan | 2016-01-14 | 3 | -57/+83 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use #sub instead of #gsub!. #3945 | Rubén Dávila | 2016-01-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is because is not a good idea to modify the original lines * Also I run into this issue https://gitlab.com/gitlab-org/gitlab_git/issues/14 which is returning Diff Lines with the same @new_pos value. | |||||
| | * | | | | | | | | | | | | | | | | Use current commit id if it doesn't have a parent. #3945 | Rubén Dávila | 2016-01-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Little refactor for usage of html_safe. #3945 | Rubén Dávila | 2016-01-13 | 4 | -9/+10 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use html_safe instead of raw. #3945 | Rubén Dávila | 2016-01-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-12 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Add more specs. #3945 | Rubén Dávila | 2016-01-12 | 1 | -0/+18 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Remove no longer required code. #3945 | Rubén Dávila | 2016-01-12 | 1 | -42/+9 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix broken spec. #3945 | Rubén Dávila | 2016-01-12 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Small fixes from code review. #3945 | Rubén Dávila | 2016-01-12 | 3 | -8/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Reuse existent vars with ref and path. #3945 | Rubén Dávila | 2016-01-12 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Make diff_line_content helper return a safe String. #3945 | Rubén Dávila | 2016-01-12 | 4 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix css for other highlighting themes. #3945 | Rubén Dávila | 2016-01-09 | 3 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix broken spec for submodule commit. #3945 | Rubén Dávila | 2016-01-09 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 2 | -87/+86 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 4 | -9/+10 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Update specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -16/+15 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Remove custom Lexer. #3945 [ci skip] | Rubén Dávila | 2016-01-08 | 2 | -28/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline diff is going to be generated client side now. #3945 | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |