Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'parallel_diff_refactor' into 'master' | Dmitriy Zaporozhets | 2014-09-09 | 24 | -282/+249 |
|\ | |||||
| * | Fix typo. | Marin Jankovski | 2014-09-09 | 2 | -2/+2 |
| * | Add line code to parallel diff for linking. | Marin Jankovski | 2014-09-09 | 2 | -12/+13 |
| * | Use the new path to the partial, move the diff related methods to the new hel... | Marin Jankovski | 2014-09-09 | 3 | -14/+13 |
| * | Fix usage of diff file mode change | Dmitriy Zaporozhets | 2014-09-08 | 1 | -1/+1 |
| * | optimize show_diff_size_warning? | Dmitriy Zaporozhets | 2014-09-08 | 3 | -6/+11 |
| * | Refactoring inside refactoring. We need to go deeper | Dmitriy Zaporozhets | 2014-09-08 | 13 | -104/+100 |
| * | Fix all broken stuff after diff refactoring | Dmitriy Zaporozhets | 2014-09-08 | 6 | -30/+5 |
| * | Use new diff parsing logic | Dmitriy Zaporozhets | 2014-09-08 | 8 | -74/+72 |
| * | Refactor diff views | Dmitriy Zaporozhets | 2014-09-08 | 11 | -64/+92 |
| * | Cleanup | Marin Jankovski | 2014-09-08 | 1 | -13/+6 |
| * | Now refactor all to work properly. | Marin Jankovski | 2014-09-08 | 2 | -111/+69 |
| * | Color the lines correctly. | Marin Jankovski | 2014-09-08 | 1 | -8/+10 |
| * | Don't show the line numbers if the lines were removed. | Marin Jankovski | 2014-09-08 | 1 | -2/+6 |
| * | Take the next type into consideration | Marin Jankovski | 2014-09-08 | 2 | -4/+5 |
| * | Coloring. | Marin Jankovski | 2014-09-08 | 1 | -10/+13 |
| * | Take added or removed file into account. | Marin Jankovski | 2014-09-08 | 1 | -9/+14 |
| * | File mode changed note. | Marin Jankovski | 2014-09-08 | 1 | -2/+6 |
| * | Remove duplication, expand for next_line. | Marin Jankovski | 2014-09-08 | 3 | -4/+11 |
| * | Duplicate the behaviour and refactor for use with parallel diff. | Marin Jankovski | 2014-09-08 | 2 | -6/+14 |
| * | Parallel diff in two columns. | Marin Jankovski | 2014-09-08 | 1 | -35/+15 |
* | | Merge pull request #7695 from coverer/search_wiki | Dmitriy Zaporozhets | 2014-09-09 | 3 | -1/+17 |
|\ \ | |||||
| * | | Fixed houndci complaining over too long lines | Ralf Seidler | 2014-09-06 | 1 | -1/+2 |
| * | | Added search wiki feature | Ralf Seidler | 2014-09-05 | 3 | -1/+16 |
* | | | Merge branch 'close_button_after_added_comment' into 'master' | Dmitriy Zaporozhets | 2014-09-09 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | After comment is added, button should go back to Close button. | Marin Jankovski | 2014-09-08 | 1 | -0/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #7646 from bushong1/snippet-search3 | Dmitriy Zaporozhets | 2014-09-09 | 10 | -6/+151 |
|\ \ \ | |||||
| * | | | Updating to persist a params snippets variable | Charles Bushong | 2014-09-05 | 5 | -37/+38 |
| * | | | Changing some formatting for the Hound, modifying some UI text | Charles Bushong | 2014-09-02 | 1 | -1/+1 |
| * | | | Adding in snippet search functionality | Charles Bushong | 2014-08-29 | 11 | -34/+178 |
* | | | | Merge pull request #7697 from Razer6/fix_project_shortcuts | Dmitriy Zaporozhets | 2014-09-08 | 3 | -4/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Change shortcut for activity to project, because navbar changed | Robert Schilling | 2014-09-08 | 3 | -4/+4 |
* | | | | Merge pull request #7596 from bbodenmiller/patch-5 | Dmitriy Zaporozhets | 2014-09-08 | 1 | -0/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | add current sign-in date | Ben Bodenmiller | 2014-08-24 | 1 | -0/+8 |
* | | | | Merge pull request #7696 from Zyphrax/master | Dmitriy Zaporozhets | 2014-09-07 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | Remove parent spacing. Fixes #7505 | Yvo van Beek | 2014-09-06 | 1 | -6/+0 |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-06 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #7193 from dloman/master | Dmitriy Zaporozhets | 2014-09-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | added str-truncated to branch list to fix issue #7192 | Daniel Loman | 2014-09-01 | 1 | -1/+1 |
* | | | | | | Pluralize commit text for note when push to existing MR | Dmitriy Zaporozhets | 2014-09-05 | 1 | -1/+2 |
* | | | | | | Add comment to merge request when new push happens | Dmitriy Zaporozhets | 2014-09-05 | 2 | -3/+38 |
|/ / / / / | |||||
* | | | | | Merge pull request #7658 from Razer6/refresh_labels_page_on_delete | Dmitriy Zaporozhets | 2014-09-05 | 3 | -9/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Show labels help message if last label is deleted | Robert Schilling | 2014-09-04 | 3 | -9/+11 |
* | | | | | Merge pull request #7305 from asedge/annotated_tags | Dmitriy Zaporozhets | 2014-09-04 | 4 | -5/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat... | Sean Edge | 2014-09-04 | 4 | -5/+15 |
* | | | | | | Fix ugly project access icons | Dmitriy Zaporozhets | 2014-09-04 | 2 | -15/+9 |
|/ / / / / | |||||
* | | | | | Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email | Dmitriy Zaporozhets | 2014-09-04 | 3 | -12/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Fix missing to on reassign MR text email to unassigned. | Ciro Santilli | 2014-09-03 | 3 | -12/+8 |
* | | | | | | Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mr | Dmitriy Zaporozhets | 2014-09-04 | 3 | -62/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Factor new issue and edit MR forms. | Ciro Santilli | 2014-09-04 | 3 | -62/+41 |