home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,472 Commits 48 Branches 340 Tags
f2007e748890a2b818b4f3b0dceea0a5158df539
Commit Graph
5768 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
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-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 29e7647a08 Merge branch 'close_button_after_added_comment' into 'master' 
Close button after added comment

Fixes #1549

See merge request !1070
 2014-09-09 11:02:10 +00:00
Marin Jankovski 2ff83aa389 Fix typo. 2014-09-09 11:52:16 +02:00
Marin Jankovski ac6a107ac7 Add line code to parallel diff for linking. 2014-09-09 11:36:29 +02:00
Marin Jankovski 9c3935c5b0 Use the new path to the partial, move the diff related methods to the new helper. 2014-09-09 11:10:40 +02:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets 93dc885530 Fix usage of diff file mode change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:25:20 +03:00
Dmitriy Zaporozhets 02e87d9223 optimize show_diff_size_warning? 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:12:54 +03:00
Dmitriy Zaporozhets 3d1a246f2c Merge pull request #7697 from Razer6/fix_project_shortcuts 
Change keyboard shortcut for activity to project
 2014-09-08 22:09:12 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Dmitriy Zaporozhets c741fcab9d Fix all broken stuff after diff refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:41:55 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets e0eb48031d Refactor diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:26:49 +03:00
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +02:00
Marin Jankovski 205358b1ae Cleanup 2014-09-08 09:05:17 +02:00
Marin Jankovski 23706716fc Now refactor all to work properly. 2014-09-08 09:05:17 +02:00
Marin Jankovski 13cfa49a3d Color the lines correctly. 2014-09-08 09:05:17 +02:00
Marin Jankovski 7d45624daf Don't show the line numbers if the lines were removed. 2014-09-08 09:05:17 +02:00
Marin Jankovski 721b75733c Take the next type into consideration 2014-09-08 09:05:17 +02:00
Marin Jankovski dc7554d020 Coloring. 2014-09-08 09:05:17 +02:00
Marin Jankovski 75b04a17cf Take added or removed file into account. 2014-09-08 09:05:17 +02:00
Marin Jankovski 357bf00921 File mode changed note. 2014-09-08 09:05:17 +02:00
Marin Jankovski f827482c12 Remove duplication, expand for next_line. 2014-09-08 09:05:16 +02:00
Marin Jankovski 1067b00724 Duplicate the behaviour and refactor for use with parallel diff. 2014-09-08 09:05:16 +02:00
Marin Jankovski b54f2393c3 Parallel diff in two columns. 2014-09-08 09:05:16 +02:00
Dmitriy Zaporozhets de6f4c3135 Merge pull request #7596 from bbodenmiller/patch-5 
add current sign-in date
 2014-09-08 09:37:21 +03:00
Dmitriy Zaporozhets f42a1ded99 Merge pull request #7696 from Zyphrax/master 
Prevent graph spacing issue
 2014-09-07 09:49:48 +03:00
Dmitriy Zaporozhets bf5fb04e5c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-06 12:52:01 +03:00
Yvo van Beek 1f355279d2 Remove parent spacing. Fixes #7505 2014-09-06 19:51:28 +10:00
Ralf Seidler 23241c181c Fixed houndci complaining over too long lines 2014-09-06 11:46:14 +02:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Dmitriy Zaporozhets fd6b7b4a30 Pluralize commit text for note when push to existing MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets b0b05aa28d Add comment to merge request when new push happens 
It allows track when user added new commits to existing merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 16:56:36 +03:00
Dmitriy Zaporozhets 1767873845 Merge pull request #7193 from dloman/master 
added htmlsafe to branch list
 2014-09-05 15:51:18 +03:00
Dmitriy Zaporozhets 60a98584f6 Merge pull request #7658 from Razer6/refresh_labels_page_on_delete 
Show labels help message if last label is deleted
 2014-09-05 14:39:40 +03:00
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02:00
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02:00
Dmitriy Zaporozhets 678f3ddd6b Merge pull request #7305 from asedge/annotated_tags 
Annotated tags
 2014-09-04 16:48:54 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Dmitriy Zaporozhets 69d149e0d0 Fix ugly project access icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 16:34:07 +03:00
Dmitriy Zaporozhets 487f78be12 Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email 
Fix missing to on reassign Merge Request text email to unassigned.
 2014-09-04 16:02:53 +03:00
Dmitriy Zaporozhets bd00233300 Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mr 
Factor new issue and edit MR forms.
 2014-09-04 16:02:27 +03:00
Dmitriy Zaporozhets 260fd2127c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-04 15:55:14 +03:00
Dmitriy Zaporozhets 0bcc323928 Merge branch 'api/issues-filter-labels' into 'master' 
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-04 12:54:08 +00:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation 
Validate branch/tag-names and references WebUI, API
 2014-09-04 15:52:42 +03:00
Dmitriy Zaporozhets 640a3c5c89 Merge pull request #7661 from cirosantilli/factor-issue-mr-email 
Fix missing to on reassign Merge Request email to unassigned.
 2014-09-04 15:49:24 +03:00
Dmitriy Zaporozhets 18e4e99764 Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-04 15:47:54 +03:00
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00