summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets2014-09-0924-282/+249
|\
| * Fix typo.Marin Jankovski2014-09-092-2/+2
| * Add line code to parallel diff for linking.Marin Jankovski2014-09-092-12/+13
| * Use the new path to the partial, move the diff related methods to the new hel...Marin Jankovski2014-09-093-14/+13
| * Fix usage of diff file mode changeDmitriy Zaporozhets2014-09-081-1/+1
| * optimize show_diff_size_warning?Dmitriy Zaporozhets2014-09-083-6/+11
| * Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-0813-104/+100
| * Fix all broken stuff after diff refactoringDmitriy Zaporozhets2014-09-086-30/+5
| * Use new diff parsing logicDmitriy Zaporozhets2014-09-088-74/+72
| * Refactor diff viewsDmitriy Zaporozhets2014-09-0811-64/+92
| * CleanupMarin Jankovski2014-09-081-13/+6
| * Now refactor all to work properly.Marin Jankovski2014-09-082-111/+69
| * Color the lines correctly.Marin Jankovski2014-09-081-8/+10
| * Don't show the line numbers if the lines were removed.Marin Jankovski2014-09-081-2/+6
| * Take the next type into considerationMarin Jankovski2014-09-082-4/+5
| * Coloring.Marin Jankovski2014-09-081-10/+13
| * Take added or removed file into account.Marin Jankovski2014-09-081-9/+14
| * File mode changed note.Marin Jankovski2014-09-081-2/+6
| * Remove duplication, expand for next_line.Marin Jankovski2014-09-083-4/+11
| * Duplicate the behaviour and refactor for use with parallel diff.Marin Jankovski2014-09-082-6/+14
| * Parallel diff in two columns.Marin Jankovski2014-09-081-35/+15
* | Merge pull request #7695 from coverer/search_wikiDmitriy Zaporozhets2014-09-093-1/+17
|\ \
| * | Fixed houndci complaining over too long linesRalf Seidler2014-09-061-1/+2
| * | Added search wiki featureRalf Seidler2014-09-053-1/+16
* | | Merge branch 'close_button_after_added_comment' into 'master'Dmitriy Zaporozhets2014-09-091-0/+6
|\ \ \
| * | | After comment is added, button should go back to Close button.Marin Jankovski2014-09-081-0/+6
| | |/ | |/|
* | | Merge pull request #7646 from bushong1/snippet-search3Dmitriy Zaporozhets2014-09-0910-6/+151
|\ \ \
| * | | Updating to persist a params snippets variableCharles Bushong2014-09-055-37/+38
| * | | Changing some formatting for the Hound, modifying some UI textCharles Bushong2014-09-021-1/+1
| * | | Adding in snippet search functionalityCharles Bushong2014-08-2911-34/+178
* | | | Merge pull request #7697 from Razer6/fix_project_shortcutsDmitriy Zaporozhets2014-09-083-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Change shortcut for activity to project, because navbar changedRobert Schilling2014-09-083-4/+4
* | | | Merge pull request #7596 from bbodenmiller/patch-5Dmitriy Zaporozhets2014-09-081-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | add current sign-in dateBen Bodenmiller2014-08-241-0/+8
* | | | Merge pull request #7696 from Zyphrax/masterDmitriy Zaporozhets2014-09-071-6/+0
|\ \ \ \
| * | | | Remove parent spacing. Fixes #7505Yvo van Beek2014-09-061-6/+0
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-061-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #7193 from dloman/masterDmitriy Zaporozhets2014-09-051-1/+1
| |\ \ \ \
| | * | | | added str-truncated to branch list to fix issue #7192Daniel Loman2014-09-011-1/+1
* | | | | | Pluralize commit text for note when push to existing MRDmitriy Zaporozhets2014-09-051-1/+2
* | | | | | Add comment to merge request when new push happensDmitriy Zaporozhets2014-09-052-3/+38
|/ / / / /
* | | | | Merge pull request #7658 from Razer6/refresh_labels_page_on_deleteDmitriy Zaporozhets2014-09-053-9/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Show labels help message if last label is deletedRobert Schilling2014-09-043-9/+11
* | | | | Merge pull request #7305 from asedge/annotated_tagsDmitriy Zaporozhets2014-09-044-5/+15
|\ \ \ \ \
| * | | | | Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat...Sean Edge2014-09-044-5/+15
* | | | | | Fix ugly project access iconsDmitriy Zaporozhets2014-09-042-15/+9
|/ / / / /
* | | | | Merge pull request #7677 from cirosantilli/factor-issue-mr-text-emailDmitriy Zaporozhets2014-09-043-12/+8
|\ \ \ \ \
| * | | | | Fix missing to on reassign MR text email to unassigned.Ciro Santilli2014-09-033-12/+8
* | | | | | Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mrDmitriy Zaporozhets2014-09-043-62/+41
|\ \ \ \ \ \
| * | | | | | Factor new issue and edit MR forms.Ciro Santilli2014-09-043-62/+41