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
238 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
Dmitriy Zaporozhets 6404d69780 Better UX for blocked users in admin area 2013-10-16 20:19:25 +03:00
Jacob Vosmaer babba432f1 Use service gitlab reload to restart sidekiq 2013-10-16 10:47:10 +02:00
Marin Jankovski a271570ea9 Show explanation . 2013-10-15 15:28:53 +02:00
Marin Jankovski 4886d8fd03 Show sidekiq running processes in the background_jobs page. 2013-10-15 13:24:17 +02:00
Dmitriy Zaporozhets 5c67c88731 Improve admin dashboard UX 2013-10-13 14:38:20 +03:00
Dmitriy Zaporozhets bd83991ac7 Use link_to_project helper 2013-10-10 10:53:49 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02: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 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 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 90dc5ff5fd Fix 500 error on admin->project page 2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets 74a621385f Extend user infiormation displayed on admin user page 2013-09-14 20:55:33 +03:00
Dmitriy Zaporozhets 317e8d1295 Merge pull request #4942 from aus/patch-2 
Add link to project page from admin view
 2013-09-11 04:19:25 -07:00
Dmitriy Zaporozhets 30b8218ffb Rename team to Project members 2013-08-30 17:10:58 +03:00
Austin Robertson e602c9b0b1 Add link to project page from admin view 2013-08-29 14:53:22 -05:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page 
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 24e26d8b7a Improve user block/removal from admin area 
Provide UI with explanation what happens when you block or remove user
When remove user - remove all groups where user is an only owner
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets afdfbd1e8a Add description to user removal block. Transfer owned groups to admin before remove 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets bbc916baee If user is owner of project it cant be removed from this project 2013-08-27 12:47:28 +03:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +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
Henry Smith 602e2e68d9 Lots of wording improvements for the project settings area 
Summary:

 - Mostly very small things involving use of "a", "the" etc.
 - "post-receive" hooks are usually written with the hyphen in the name .
 - I changed the Web Hooks page to have a title consistent with all the other
   pages in the settings area.
 - More consistent usage of full-stops in lists.
 2013-08-15 19:19:29 +01: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 acc21d30fb Increase input padding. Minor ui fixes 2013-08-08 11:57:34 +03:00
Dmitriy Zaporozhets b2152847b1 Replace xlarge and xxlarge classes 2013-08-07 23:40:29 +03:00
Dmitriy Zaporozhets 846e59505e Replace .actions with .form-actions 2013-08-07 23:35:24 +03:00
Dmitriy Zaporozhets 49fa9907ae use control-group classes for inline forms in admin area 2013-08-07 23:20:10 +03:00
Dmitriy Zaporozhets 7fe779b86f Add/remove user to appropriate groups based on LDAP settings 2013-08-05 15:15:58 +03:00
Dmitriy Zaporozhets e834742407 Dont load bootstrap buttons. Modified css with new buttons 2013-08-01 22:35:40 +03:00
Dmitriy Zaporozhets 9f38cf5093 Improve Notifications page. Much easier to find muted projects now 2013-07-31 17:05:22 +03:00
Dmitriy Zaporozhets 374722030f Remove unecessary titles in admin area 2013-07-15 15:11:34 +03:00
Dmitriy Zaporozhets a41875d21e Replace %h5.title with div.title 2013-07-13 20:36:21 +03:00
Dmitriy Zaporozhets 3805797cae scss: rename file_content to file-content etc 2013-07-13 09:52:47 +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 6ace422c29 Merge branch 'master' into 6-0-dev 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-08 09:50:10 +03:00
GitLab 015d8da731 Updating documentation to reflect #3836 (resolving #4443) 2013-07-01 21:14:39 -05:00
Izaak Alpert d1da45e1a3 Rebasing on master 
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
 2013-06-26 11:08:55 -04:00
Dmitriy Zaporozhets 1dd80d22a5 Prevent confusion in naming user variable at admin area 2013-06-26 15:57:02 +03:00
Izaak Alpert c1b05e7b86 Gravatar image fixes when gravatar unavailable 
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar  wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)

Conflicts:
	app/assets/stylesheets/themes/ui_bb.scss
	app/views/snippets/_snippet.html.haml

Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
 2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets ee13297af2 Cleanup: removed unused routing/methods. Improved admin area usability 2013-06-22 14:11:20 +03:00
Dmitriy Zaporozhets 0bc714c271 Remove form for adding user to several projects from admin area. 
Remove unnecessary projects order on User#show
 2013-06-22 13:41:08 +03:00
Dmitriy Zaporozhets dc0f08f8d8 Show also group members on project page at admin area 2013-06-22 00:11:06 +03:00
Dmitriy Zaporozhets 2864aca48c Fix admin:groups test 2013-06-20 13:29:17 +03:00
Dmitriy Zaporozhets 86d9ed9a0a Fix user add to group from admin area 2013-06-20 12:06:44 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00