home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,419 Commits 48 Branches 340 Tags
v6.6.0
Commit Graph
1020 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets f745c6e5b5 Merge branch 'improve_large_groups' into 'master' 
Improve for large groupsImprove for large groups

This merge request is a set of patched to improve application for large groups with more then 100 people.

Pages to be improved:
✅ Group#members page
✅ Project#issues page
✅ Project#merge_requests page
✅ Project#new_issue page
✅ Project#new_mr page
✅ Project#members page
 2014-02-14 13:13:42 +00:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06: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 af9d7fafa9 Adopt Group#members page for large groups (> 100 users) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 11:00:44 +02:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01: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 1bcf0aa2e6 Merge pull request #6297 from jojosch/user-public-ssh-keys-newline 
Split the user ssh keys by newline, not the characters "\n"
 2014-02-11 21:07:52 +02:00
Dmitriy Zaporozhets 6e47fbf5d9 Merge branch 'bug/gravatr_select2' into 'master' 
Dont use gravatars for user select if gravatar is disabled

Fixes #836
 2014-02-11 18:28:21 +00:00
Johannes Schleifenbaum f10153818b Split the user ssh keys by newline, not the characters "\n" 
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
 2014-02-11 19:24:23 +01:00
Dmitriy Zaporozhets 39aeac71b3 Merge pull request #6177 from cirosantilli/public-user-pages 
User pages are public
 2014-02-11 18:43:03 +02:00
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh 
ssh keys publically available for sysadmins via http, the github way
 2014-02-11 18:41:10 +02:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +01:00
Dmitriy Zaporozhets 348e44ef06 Dont use avatars for user select if avatar is disabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 15:49:39 +02:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
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 657eb7ba93 Merge branch 'bug/filtering_service' into 'master' 
Fix wrong issues appears at Dashboard#issues page

Fixes #1028
 2014-02-10 18:52:08 +00: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 56f989e53e Fix wrong issues appears at Dashboard#issues page 
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:04:52 +02:00
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
GitLab 1c9a41e0d5 adding tests for the ssh keys feature 2014-02-06 14:42:59 +05:30
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
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Jason Hollingsworth 71c157e43b Add files to path blacklist. 
Remove empty ErrorsController
 2014-01-24 20:06:44 -06: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 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02: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 de68dd2601 Merge pull request #6062 from skv-headless/fix_n+1_user_page 
fix n+1 problem for namespaces
 2014-01-16 02:28:01 -08: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 6153aa1360 Use FilteringService for Dashboard, Group pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 16:16:45 +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