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
2277 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8dc185c1f5 Fix EE note blow sign-in form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 15:06:29 +02:00
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
Romain 53564d9009 A few other iids instead of ids (mostly in edit forms) 2013-10-19 09:23:51 +02:00
Romain bae18f0a98 Show milestones iid instead of id 2013-10-19 09:08:54 +02:00
Dmitriy Zaporozhets 2cd3d42181 Use gitlab_config intead of Gitlab.config.gitlab in views 2013-10-17 22:11:41 +03:00
Dmitriy Zaporozhets 9afc930b99 Make ui-box-show more visible. Refactor some css classes 2013-10-16 20:42:42 +03:00
Dmitriy Zaporozhets 6404d69780 Better UX for blocked users in admin area 2013-10-16 20:19:25 +03:00
Dmitriy Zaporozhets 9d97224941 Project share UI: Replace groups list with selectbox 2013-10-16 14:17:41 +03:00
Jacob Vosmaer babba432f1 Use service gitlab reload to restart sidekiq 2013-10-16 10:47:10 +02:00
Dmitriy Zaporozhets 7ea00b183c Merge branch 'sidekiq_workers_show' of /home/git/repositories/gitlab/gitlabhq 2013-10-15 17:19:18 +00: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 01186f9fc6 Show confirmation status in profile 2013-10-15 11:19:19 +03:00
David Pursehouse 2fbe4fad13 Improve the repository import message 2013-10-15 13:58:05 +09:00
Dmitriy Zaporozhets eda5b3b1c5 Fix relative links from Help#API page 2013-10-14 16:47:05 +03:00
Dmitriy Zaporozhets 627cb28f11 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-14 14:08:41 +03:00
Dmitriy Zaporozhets 55327823c4 Added links to submodules 2013-10-14 13:27:32 +03:00
Marin Jankovski 9ed59ee9f0 Include project_id in webhook payload. 2013-10-14 12:03:25 +02:00
Dmitriy Zaporozhets 5c67c88731 Improve admin dashboard UX 2013-10-13 14:38:20 +03:00
Dmitriy Zaporozhets 70b793eb7a Lighter border color for ui-box. Show closed keyword for issues list 2013-10-13 11:00:51 +03:00
Dmitriy Zaporozhets 995ce5fdc7 Fix 500 error on page with submodules 2013-10-12 10:01:27 +03:00
Dmitriy Zaporozhets f81532b5b9 Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:02:30 +00:00
Sytse Sijbrandij 39c78b71c1 Add information about admin. 2013-10-11 12:15:18 +02:00
Dmitriy Zaporozhets 9fa94cad56 Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:12 +00:00
Sytse Sijbrandij 6cc3bb0f8f Explain how group and project permissions interact. 2013-10-11 10:40:22 +02:00
Dmitriy Zaporozhets e8d1e827d8 Remove unnecessary tag 2013-10-10 12:14:21 +03:00
Sytse Sijbrandij b0502c20a9 Consistent naming to make difference between clicking on profile pic and profile settings clear. 2013-10-10 10:43:24 +02:00
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 ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +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
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 eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03: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 ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 89654431ea Group#ldap_cn selectbox with ajax autocomplete via api 2013-10-01 12:04:14 +03:00
Dmitriy Zaporozhets ac6180bcb0 Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq 2013-10-01 08:14:05 +00:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02: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
Perry Faro 96ae1a8099 Add check if the signup setting is enabled. fixes #4832 2013-09-27 11:56:30 +02: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