Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-09-09Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets
Parallel diff refactor Refactor side-by-side diff to remove code duplication. Base the side-by-side diff on inline diff code. In first iteration: 1. commenting on the side-by-side diff is not possible 1. no expanding of the surrounding code See merge request !1066
2014-09-09Merge pull request #7695 from coverer/search_wikiDmitriy Zaporozhets
Added search wiki feature
2014-09-09Merge branch 'close_button_after_added_comment' into 'master'Dmitriy Zaporozhets
Close button after added comment Fixes #1549 See merge request !1070
2014-09-09Fix typo.Marin Jankovski
2014-09-09Add line code to parallel diff for linking.Marin Jankovski
2014-09-09Use the new path to the partial, move the diff related methods to the new ↵Marin Jankovski
helper.
2014-09-09Merge pull request #7646 from bushong1/snippet-search3Dmitriy Zaporozhets
Adding in snippet search functionality
2014-09-08Fix usage of diff file mode changeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08optimize show_diff_size_warning?Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08Merge pull request #7697 from Razer6/fix_project_shortcutsDmitriy Zaporozhets
Change keyboard shortcut for activity to project
2014-09-08Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08Change shortcut for activity to project, because navbar changedRobert Schilling
2014-09-08Fix all broken stuff after diff refactoringDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08Use new diff parsing logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08Refactor diff viewsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08After comment is added, button should go back to Close button.Marin Jankovski
2014-09-08CleanupMarin Jankovski
2014-09-08Now refactor all to work properly.Marin Jankovski
2014-09-08Color the lines correctly.Marin Jankovski
2014-09-08Don't show the line numbers if the lines were removed.Marin Jankovski
2014-09-08Take the next type into considerationMarin Jankovski
2014-09-08Coloring.Marin Jankovski
2014-09-08Take added or removed file into account.Marin Jankovski
2014-09-08File mode changed note.Marin Jankovski
2014-09-08Remove duplication, expand for next_line.Marin Jankovski
2014-09-08Duplicate the behaviour and refactor for use with parallel diff.Marin Jankovski
2014-09-08Parallel diff in two columns.Marin Jankovski
2014-09-08Merge pull request #7596 from bbodenmiller/patch-5Dmitriy Zaporozhets
add current sign-in date
2014-09-07Merge pull request #7696 from Zyphrax/masterDmitriy Zaporozhets
Prevent graph spacing issue
2014-09-06Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2014-09-06Remove parent spacing. Fixes #7505Yvo van Beek
2014-09-06Fixed houndci complaining over too long linesRalf Seidler
2014-09-05Updating to persist a params snippets variableCharles Bushong
2014-09-05Pluralize commit text for note when push to existing MRDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-05Add comment to merge request when new push happensDmitriy Zaporozhets
It allows track when user added new commits to existing merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-05Merge pull request #7193 from dloman/masterDmitriy Zaporozhets
added htmlsafe to branch list
2014-09-05Merge pull request #7658 from Razer6/refresh_labels_page_on_deleteDmitriy Zaporozhets
Show labels help message if last label is deleted
2014-09-05Added search wiki featureRalf Seidler
2014-09-05Show labels help message if last label is deletedRobert Schilling
2014-09-04Merge pull request #7305 from asedge/annotated_tagsDmitriy Zaporozhets
Annotated tags
2014-09-04Added annotated tags. Updated tag haml file and call to gitlab-shell. ↵Sean Edge
Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.
2014-09-04Fix ugly project access iconsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-04Merge pull request #7677 from cirosantilli/factor-issue-mr-text-emailDmitriy Zaporozhets
Fix missing to on reassign Merge Request text email to unassigned.
2014-09-04Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mrDmitriy Zaporozhets
Factor new issue and edit MR forms.
2014-09-04Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2014-09-04Merge branch 'api/issues-filter-labels' into 'master'Dmitriy Zaporozhets
API: Filter issues by labels While working on [laboard](https://gitlab.com/jubianchi/laboard) I had some issues with the API : I was not able to filter issues by labels so I had to write some logic to do it on my side. I think it will be useful to have this feature supported by the Gitlab API. I added the filtering logic on `/issues` and `/projects/:id/issues`. The commits are not squashed but I'll do it once everything seems ok to you. See merge request !169
2014-09-04Merge pull request #7382 from Razer6/git_ref_validationDmitriy Zaporozhets
Validate branch/tag-names and references WebUI, API
2014-09-04Merge pull request #7661 from cirosantilli/factor-issue-mr-emailDmitriy Zaporozhets
Fix missing to on reassign Merge Request email to unassigned.
2014-09-04Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into ↵Dmitriy Zaporozhets
cirosantilli-sha-link Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
2014-09-04Filters issues by labels via APIjubianchi