home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,583 Commits 48 Branches 340 Tags
6dff16a6799cc34cd2cf70cebce70bbffc70c3f5
Commit Graph
5805 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Dmitriy Zaporozhets 09b23228df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-15 10:20:43 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00:00
Tamer Sherif a391cd21d7 Fix grammatical error in 'not merged changes' msg 2014-09-14 12:31:32 +03:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Dmitriy Zaporozhets cbb44b9da3 Merge pull request #7662 from Razer6/disable_buttons_on_empty_form 
[UX] Disable buttons if form is empty
 2014-09-12 13:41:48 +03:00
Dmitriy Zaporozhets 318d5d93e3 Merge pull request #7522 from Razer6/fix_tags_count 
[UX] Update tag count if tag gets deleted via web interface
 2014-09-12 13:39:56 +03:00
Sytse Sijbrandij 21134df202 Merge pull request #7713 from bbodenmiller/patch-5 
Add Feedback link
 2014-09-12 11:32:41 +02:00
Ben Bodenmiller 47171aab3d add requests link 
Add requests link for feature requests.
 2014-09-12 02:07:17 -07:00
Dmitriy Zaporozhets a034a46652 Merge pull request #7737 from Razer6/feature/zenmaster 
Zen Mode for issues/MR/notes
 2014-09-12 08:54:52 +03:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Robert Schilling 233d89a9e7 Disable buttons if required forms are empty 2014-09-11 19:48:02 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes 
Close Zen mode by ESC, foward/backward
 2014-09-11 19:24:51 +02:00
Dmitriy Zaporozhets 80174c16d6 Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

Only use class methods when needed. In addition, make a proper extension of Gitlab::Oauth::User.

See merge request !1062
 2014-09-11 13:33:06 +00:00
Dmitriy Zaporozhets 350f557479 Make labels clickable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-11 14:18:00 +03:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master' 
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
 2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets 59187157b1 Merge pull request #7730 from bbodenmiller/patch-12 
url -> URL
 2014-09-11 09:24:11 +03:00
Ben Bodenmiller d915a239f7 Increase import timeout from 2 to 4 minutes 
This file was missed in https://github.com/gitlabhq/gitlabhq/commit/4535db04b28996baf118bafeb77acd16065e5c5a.
 2014-09-10 18:38:47 -07:00
Ben Bodenmiller 9d9109eecf url -> URL 2014-09-10 18:20:06 -07:00
Ben Bodenmiller bc04c26325 url -> URL 2014-09-10 18:19:31 -07:00
Ciro Santilli 84bbf07d96 Typo localy -> locally. 2014-09-10 22:20:40 +02:00
Dmitriy Zaporozhets ebae2d0241 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-10 20:47:59 +03:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Dmitriy Zaporozhets 1e1dd53948 Merge branch 'word_wrap_in_description' into 'master' 
Word wrap in description

Fixes #1560

See merge request !1082
 2014-09-10 17:17:48 +00:00
Marin Jankovski 4e6d0daf1a Wrap text that overflows the description field. 2014-09-10 17:30:29 +02:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Marin Jankovski 11eec88d97 Wrap should always be enabled for parallel diff. 2014-09-10 16:46:10 +02:00
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