home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,347 Commits 48 Branches 340 Tags
556ddbcad49be5d59cd6275639ac149f5b2ee7ac
Commit Graph
143 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9c7a9d92ff Merge pull request #6773 from tsigo/rs-tag-page-sorting 
Use VersionSorter on the Project > Tags page
 2014-04-15 09:30:39 +03:00
Robert Speicher c803e78fd0 Use VersionSorter on the Project > Tags page 2014-04-14 12:40:27 -04:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master' 
Satellite exists in automerge check
 2014-04-14 13:21:49 +00:00
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Marin Jankovski 872482678b Speed up loading and add pagination to wiki pages page. 2014-04-11 10:02:52 +02:00
Dmitriy Zaporozhets 4e9add7c2c Merge branch 'clean_old_archives' into 'master' 
Clean old archives from repository downloads directory
 2014-04-09 17:50:09 +00:00
Marin Jankovski b2959c4102 Remove archives older than 2 hours. 2014-04-09 15:09:11 +02:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets d238a21bcb Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook 
Fix url generation error on hook invalid create
 2014-04-07 19:55:09 +03:00
Dmitriy Zaporozhets d92e4830f7 Allow people to remove source branch of fork project in MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 19:11:02 +03:00
skv 4cc2afdf2e Fix url generation error on hook invalid create 2014-04-06 19:42:24 +04:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Dmitriy Zaporozhets 95b84e2c5a Move branch creation logic in service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-01 10:33:23 +03:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets f08464c055 Remove author_id_of_changes from app 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:01:52 +02:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets a9280de11f Better redirect for edit blod from MergeRequest 
If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 14:06:31 +02:00
Dmitriy Zaporozhets 5d6e4bd2d8 Fix gitlab ci widget for forks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 13:18:27 +02:00
Dmitriy Zaporozhets 1ff1b6d816 Merge pull request #5719 from jacob-carlborg/mr_target 
By default, target original repository if it's a fork when creating new MR.
 2014-02-26 12:33:48 +02:00
Dmitriy Zaporozhets 645e8d4705 Move services for collecting items to Finders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 19:15:08 +02:00
Dmitriy Zaporozhets 8eeebf0de6 Generate labels set from issues page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 17:47:29 +02:00
Jacob CarlborgandJacob Carlborg 9439cb5526 By default, target original repository if fork when creating new MR. 2014-02-24 22:06:25 +01:00
Dmitriy Zaporozhets e39f0de8ee Add edit button to MergeRequest diff 
It will redirect you to file edit page.
After submit changes you will be redirected back to merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 16:39:13 +02:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets 702128892b Allow change assignee/milestone from MergeRequest show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 16:24:27 +02:00
Dmitriy Zaporozhets 6f0126385d Merge pull request #6313 from jvanbaarsen/fix-6207-msi-mimetype 
Fixes #6207 Allow raw download of *.msi files
 2014-02-18 11:25:34 +02:00
Jeroen van Baarsen aaad7fd973 Fixes #6207 Allow raw download of *.msi files 
This PR also allows for download of [exe,rar,r0n,7z,7zip,zip]
Fix was originaly proposed by @MensSana
 2014-02-13 20:09:11 +01:00
Dmitriy Zaporozhets abb3121308 Show only people who have assigned merge requests in assignee dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 13:59:07 +02:00
Dmitriy Zaporozhets 13ecbb04bc Show only people who have assigned issues in assignee dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 13:57:11 +02:00
Dmitriy Zaporozhets 0bcabdaf83 Use gitlab_git 5.4.0 without BROKEN_DIFF constant 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:54:49 +02:00
Dmitriy Zaporozhets 9a3d665919 Show last commit for Blob#show 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 21:46:46 +02:00
Dmitriy Zaporozhets 58ac731c37 Fix Issues#bulk_update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:36:58 +02:00
Dmitriy Zaporozhets a1a01254b9 Prevent 500 error on Compare page if diff read timout happens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:21:41 +02:00
Dmitriy Zaporozhets 8f88cbf06b Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:09:13 +02:00
Dmitriy Zaporozhets ca7e4a948b Use new tags/branches from gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:13:24 +02:00
Dmitriy Zaporozhets f416b2f5cf Fix bug with merge request branch select 
Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:24:38 +02:00
Dmitriy Zaporozhets 237ddd6024 Improve authorization for new/edit blob pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:52 +02:00
Dmitriy Zaporozhets 4645f464a3 Allow developers to mange issue tracker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:22 +02:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets ccae561f9b Fix selectbox when submit MR from fork to origin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 10:08:26 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
Dmitriy Zaporozhets 193a5ed3c3 Render MR diff correctly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:40 +02:00
Dmitriy Zaporozhets e583df5443 Dont override project_id params when use issues/mr filtering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-20 14:16:12 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 1d2bdb4d58 Move all Context classes into Services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 19:03:42 +02:00
Dmitriy Zaporozhets e3f436dc43 Merge branch 'refactoring/issues_filter' into 'master' 
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
 2014-01-16 10:21:21 +00:00