home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,994 Commits 48 Branches 340 Tags
be150fa9913d760802dc4c673ed59930f03ffec0
Commit Graph
101 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 234b86c97f Use FilteringService for project issuus, mrs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:32:44 +02:00
Dmitriy Zaporozhets 7bcd112a29 Fix commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 15:31:49 +02:00
Dmitriy Zaporozhets f19cdee8cc Remove commit_load_context.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 15:06:12 +02:00
Dmitriy Zaporozhets 8bfc62fb8b Convert TestHookContext into TestHookService. Added tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:38:50 +02:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets 2940785c17 Add sort dropdown to merge requests list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:55:59 +02:00
Dmitriy Zaporozhets 8781459124 Use params[:merge_commit_message] in MergeRequestController for automerge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 17:21:59 +02:00
Jason Hollingsworth 7cc2520541 Add support for various archive formats. 
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
 2014-01-02 10:18:56 -06:00
Dmitriy Zaporozhets 19c2c90cca Merge pull request #5928 from skv-headless/master 
Fix warnings
 2013-12-26 00:40:30 -08:00
Dmitriy Zaporozhets f554aa38d5 Update commentable controllers with new note vars 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:32:48 +02:00
Dmitriy Zaporozhets 48c682b52f Switch Notes controller to use json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:32:23 +02:00
skv a443a19862 fix warnings 2013-12-25 23:29:40 +04:00
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets 1231a3678a Dont allow change of MR target or source projects after it was created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 09:48:43 +02:00
Dmitriy Zaporozhets ca29617d54 Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates 
Fix dashboard event caching
 2013-12-16 10:03:52 -08:00
Dmitriy Zaporozhets d46dba5830 Merge pull request #5847 from skv-headless/fix_deprecation_warnings 
fix most of warnings
 2013-12-16 03:22:55 -08:00
Takuya Nishigori e78b90ab1d Fix messages typo 2013-12-16 17:57:50 +09:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Drew Blessing 63723ef6df Fix dashboard event caching 2013-12-13 13:40:45 -06:00
Dmitriy Zaporozhets cb599a09be Allow close of broken MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 6c3459978d Add new methods to MR to check if source or target branch exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:34:42 +02:00
Dmitriy Zaporozhets 4f32d2e28e Remove GET .js format for Milestone controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:32:54 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:27:36 +02:00
Dmitriy Zaporozhets da10cad1da Drop rjs from Issues#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 15:05:32 +02:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 14:46:40 +02:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-28 11:38:20 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Jason Blanchard b76948e6c9 Added sorting to project issues page 2013-11-23 15:04:50 -05:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature 
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 16:41:29 +02:00
Dmitriy Zaporozhets 160bd862be Refactoring for EditTree and NewTree controllers and contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:21:11 +02:00
Dmitriy Zaporozhets f61850e6e3 Move part of file creation logic into separate context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:06:52 +02:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00
Johannes Schleifenbaum cc505f550d Check if a file is editied "on" a branch or a commit. 
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.

If the 	user accesses a path like "/edit/master/README" show the file
edit form (just like before).

If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.

fixes #5482
 2013-10-30 11:34:26 +01:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Dmitriy Zaporozhets 2eb76186f5 Merge pull request #5158 from tkoenig/fix-active-milestone-order 
Sort active milestones by due date (upcoming first)
 2013-10-07 03:35:09 -07:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets 836c870cc9 Fix edit file 2013-10-01 17:08:40 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00