home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
89 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets 89654431ea Group#ldap_cn selectbox with ajax autocomplete via api 2013-10-01 12:04:14 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Dmitriy Zaporozhets c6096e47d6 Mention permissions table on Group#members page 2013-09-26 15:08:33 +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 c2f1040006 Few fixes to spinach tests 2013-08-27 13:49:29 +03:00
Dmitriy Zaporozhets 61d9860158 Remove team mentions 2013-08-27 12:59:44 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb
 2013-08-16 14:37:51 +03:00
Dmitriy Zaporozhets 12d55ba6cc Provide links from Group issues, mr pages to corresponding Dashboard pages 2013-08-15 13:13:22 +03:00
Dmitriy Zaporozhets cc36f6dcf8 Few fixes after pull from gitlab upstream 2013-08-12 14:20:08 +03:00
Dmitriy Zaporozhets 9ff730254a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	db/schema.rb
 2013-08-12 13:47:02 +03:00
Dmitriy Zaporozhets 915315a460 ldap_access field added to group. set ldap group membership based on ldap_access value 2013-08-09 12:53:52 +03:00
Dmitriy Zaporozhets b2152847b1 Replace xlarge and xxlarge classes 2013-08-07 23:40:29 +03:00
Dmitriy Zaporozhets a3b0dc2e17 use control-group classes for inline forms in profile and group pages 2013-08-07 23:24:34 +03:00
Dmitriy Zaporozhets 512cd02335 Dashboard/Group issues and mr pages refactoring 2013-08-06 21:12:01 +03:00
Dmitriy Zaporozhets 21c70354f6 Restyle group members page a bit 2013-08-06 20:12:20 +03:00
Dmitriy Zaporozhets 4b3fa67cb7 Add ldap_cn field to Group 2013-08-02 15:58:40 +03:00
Dmitriy Zaporozhets 3e9460b6cb Fix minor wording 2013-08-01 16:11:50 +03:00
Dmitriy Zaporozhets fc6e2cdb71 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 
Conflicts:
	app/views/groups/_projects.html.haml
 2013-07-19 15:11:02 +03:00
Dmitriy Zaporozhets a41875d21e Replace %h5.title with div.title 2013-07-13 20:36:21 +03:00
Dmitriy Zaporozhets 36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets dc038a7108 Rename Group#people to Group#members 2013-07-12 19:01:39 +03:00
Dmitriy Zaporozhets b50bc135d0 Add shared projects to User#authorized_projects 2013-07-11 12:02:25 +03:00
Dmitriy Zaporozhets a7026369cf Show real shared projects at group page 2013-07-11 11:51:02 +03:00
Dmitriy Zaporozhets 5c4c10e866 Improve shared projects title, moved Groups menu item right below Members menu item. 2013-07-11 09:36:38 +03:00
Dmitriy Zaporozhets 58a2a3bacb Show shared projects at group dashboard 2013-07-10 19:21:46 +03:00
Dmitriy Zaporozhets 3dcc441916 Cleaner dashboard sidebar 2013-07-09 20:52:06 +03:00
Dmitriy Zaporozhets 746ffcfcbd Make group settings menu looks similar to project settings menu 2013-06-25 13:15:07 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 7d57b96ee0 Update authorized/owned resources with new group permissions 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets e12c9ee2bc Added UsersGroup scaffold. Simplify adding people to group 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 209f96bebe Use project.team over project.users 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets e940fbc7c1 Add UsersGroup relation to be respected by abilities and Project#team 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets fa877b6312 UsersGroup specs. Fixed db/schema 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 95965d3f54 Added UsersGroup validations. Added ability to add UsersGroup to group via UI 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets c38a6fe173 Group people management: replace selectbox with ajax one. 2013-06-11 13:51:22 +03:00
Dmitriy Zaporozhets 6955c07597 navless layout for new group/team. Proper title for this pages 2013-06-07 17:41:01 +03:00
Dmitriy Zaporozhets 20ce3980d3 public_icon, private_icon helpers 2013-06-06 14:02:29 +03:00
evalhub efa79936c3 Update show.atom.builder 
Fix for https://github.com/gitlabhq/gitlabhq/issues/4157
 2013-06-01 15:14:43 +03:00
Dmitriy Zaporozhets 987b51b911 Fix 500 error on group.settings page 2013-05-27 21:02:42 +03:00
Dmitriy Zaporozhets 246989bcca more descriptive confirmation messages 2013-05-27 15:43:44 +03:00
Dmitriy Zaporozhets ca225d92c3 Replace inline document.ready with dispatcher 2013-05-02 11:18:29 +03:00
Dmitriy Zaporozhets 142fd2c11d move promo section in shared partial 2013-04-19 18:09:14 +03:00
Sytse Sijbrandij 92b4b77a2a Hat tip to Jan Mauritz Faber for his suggestions. 2013-04-10 09:19:08 +02:00
Dmitriy Zaporozhets 37eeeb9fca Redesign issues, mr lists 2013-04-06 15:10:24 +03:00
Dmitriy Zaporozhets ff4471a3cd Get rid of event decorator. Use event data hash instead commit objects to increase perfomance 2013-04-05 19:47:12 +03:00
Dmitriy Zaporozhets 88d42c2e1c Replace projects_box with ui-box. Fixed team spinach test 2013-03-14 13:12:11 +02:00
Dmitriy Zaporozhets f4f36f78dd Remove separate search page from group 2013-03-14 12:37:28 +02:00