home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,697 Commits 48 Branches 340 Tags
d1ffbdfcb63bbd50573cfda4c59217bb60e76c7e
Commit Graph
3677 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d1ffbdfcb6 Avoid 500 error on project page when application is close to RAM limit 2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets bd83991ac7 Use link_to_project helper 2013-10-10 10:53:49 +03:00
Dmitriy Zaporozhets 573c89e624 Improve Profile#account page UI 2013-10-10 10:30:07 +03:00
Dmitriy Zaporozhets 1935b494f6 Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq 2013-10-10 04:58:17 +00:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets 92768844cf Reverted accidently removed registration module 2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +03:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers 
Use proper titles for issues trackers
 2013-10-09 04:10:09 -07:00
Dmitriy Zaporozhets 87ffd67617 Improve Profile settings UI 2013-10-09 12:30:49 +03:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Andrew Kumanyaev 9ee49c5c49 Update merge requests from fork project to origin project 
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
 2013-10-08 16:45:57 +04:00
Dmitriy Zaporozhets c147b571f4 Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq 2013-10-08 09:28:27 +00:00
Dmitriy Zaporozhets 5cf31b92c4 Fix system hook page description 2013-10-08 12:06:46 +03:00
Dmitriy Zaporozhets 9a0329016b Mention SystemHook user_id in sample. Extend tests 2013-10-08 11:06:38 +03:00
Dmitriy Zaporozhets 3d51147de1 Add user_id to system hook when new user created 2013-10-08 10:54:40 +03:00
Dmitriy Zaporozhets eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets b658489f27 Fix bugs when discussion visible in wrong project 
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
 2013-10-07 14:49:01 +03: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 83c727c550 Merge pull request #5216 from bladealslayer/feature/flowdock_integration 
Added Flowdock integration support via a service.
 2013-10-04 08:00:51 -07:00
Boyan Tabakov e8b6974af3 Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit. 
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
 2013-10-03 16:36:43 +03:00
Yatish Mehta 9d622bd790 Typo:Corrected the typo of sign-in in User Model 2013-10-03 14:34:51 +05:30
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
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Dmitriy Zaporozhets ac6180bcb0 Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq 2013-10-01 08:14:05 +00:00
Dmitriy Zaporozhets 9ffabc6d7e Merge pull request #5200 from pfaro/bugfix-signup 
Add check if the signup setting is enabled. fixes #4832
 2013-09-30 07:04:40 -07:00
Dmitriy Zaporozhets 278250821c Remove grit require 2013-09-30 13:59:16 +03:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02:00
Dmitriy Zaporozhets dd2847f538 Few UI fixes for notes 2013-09-30 09:50:30 +03:00
Boyan Tabakov d8562cc9a1 Added Flowdock integration support via a service. 
Added test for the FlowdockService.
 2013-09-29 20:31:08 +03:00
Perry Faro 96ae1a8099 Add check if the signup setting is enabled. fixes #4832 2013-09-27 11:56:30 +02:00
Dmitriy Zaporozhets 052a7cc9cd Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
 2013-09-26 22:19:01 +03:00
Dmitriy Zaporozhets 5e843a1769 Explain on dashboard that limit amount of projects displayed 2013-09-26 19:46:31 +03:00
Dmitriy Zaporozhets c6096e47d6 Mention permissions table on Group#members page 2013-09-26 15:08:33 +03:00
Dmitriy Zaporozhets 482f64c574 Mention group permissions on Help#permissions page 2013-09-26 15:06:00 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00
Dmitriy Zaporozhets 02cf9aa687 Group owner or admin can remove other group owners 2013-09-26 10:28:43 +03:00
Dmitriy Zaporozhets 8674e1c227 Group has multiple owners so no sense to show one at dashboard list 2013-09-26 10:02:18 +03:00
Dmitriy Zaporozhets b6adabb45d Merge branch '6-1-stable' 
Conflicts:
	lib/tasks/gitlab/check.rake
 2013-09-25 18:34:50 +03:00
Dmitriy Zaporozhets 7bb03a536a Hide new issue button if not authorized 2013-09-25 18:26:54 +03:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Dmitriy Zaporozhets c611ea513c Fixed styling for delete button of snippet 2013-09-25 17:20:07 +03:00
Dmitriy Zaporozhets 11605c2d8d Tree files use normal font-weight 2013-09-25 16:59:38 +03:00