home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,670 Commits 48 Branches 340 Tags
746ffcfcbdd28a0965ab7d15860aa07977bc4c2f
Commit Graph
5670 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 746ffcfcbd Make group settings menu looks similar to project settings menu 2013-06-25 13:15:07 +03:00
Dmitriy Zaporozhets 8fb84104e4 Use graph ticks to make axis more readable 2013-06-25 12:39:58 +03:00
Dmitriy Zaporozhets d40e6bc228 Fix key observer 2013-06-25 12:02:10 +03:00
Dmitriy Zaporozhets d41940d36e Merge branch 'master' into 6-0-dev 
Conflicts:
	app/views/projects/issues/show.html.haml
	db/fixtures/development/09_issues.rb
	db/fixtures/development/10_merge_requests.rb
 2013-06-24 22:13:00 +03:00
Dmitriy Zaporozhets 106764ab3b update gems. remove console.log 2013-06-24 22:03:32 +03:00
Dmitriy Zaporozhets 89a1e7e1f5 Fix ssh key test 2013-06-24 21:00:33 +03:00
Dmitriy Zaporozhets b4a9cab7f0 Fix ssh key test 2013-06-24 20:47:59 +03:00
Dmitriy Zaporozhets 113d2ff525 store and display public key fingerprint 2013-06-24 20:07:21 +03:00
Dmitriy Zaporozhets 05a7e8b9c0 Better design for SSH keys page 2013-06-24 19:25:10 +03:00
Dmitriy Zaporozhets 15f62fcc27 Fix profile emails with new key route 2013-06-24 19:24:27 +03:00
Dmitriy Zaporozhets 884498c59f Merge pull request #4410 from senny/dont_console_log_in_code 
we should not use `console.log` in production code...
 2013-06-24 08:43:53 -07:00
Yves Senn f3a9240237 we should not use console.log in production code... 2013-06-24 17:40:23 +02:00
Dmitriy Zaporozhets afc9d54819 Fix new ssh key link from shared partial 2013-06-24 18:26:57 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 20ed39e781 Merge pull request #3898 from jacargentina/notifymentioned 
Notify email to mentioned users; show participants ala github on issuables
 2013-06-24 08:20:58 -07:00
Javier Castro cf35d19c2e Show participants on issues, including mentions, and notify email to all participants 2013-06-24 11:55:44 -03:00
Dmitriy Zaporozhets a324960d92 Merge pull request #4407 from jackbot/master 
Database seeding failing
 2013-06-24 06:56:07 -07:00
Jack Weeden 905eb17614 Merge branch 'master' of github.com:jackbot/gitlabhq 2013-06-24 14:53:40 +01:00
Jack Weeden a5d6bbe0af cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures 2013-06-24 14:21:46 +01:00
Yves Senn b8eee565a8 Merge pull request #4369 from zeehio/patch-1 
[Doc] Update 5.0 to 5.1: Recompile assets
 2013-06-24 00:12:12 -07:00
Dmitriy Zaporozhets e55e23bbda Merge branch 'refactor/projects_controllers' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev 2013-06-23 18:56:05 +00:00
Dmitriy Zaporozhets 40bca5246b Fix routing/controller specs for refactored controllers 2013-06-23 20:25:06 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 95791316f4 Lets fix tests 2013-06-22 23:57:29 +03:00
Dmitriy Zaporozhets e45179c9b4 remove useless routing tests. Added symlink creation for project with code 2013-06-22 18:57:34 +03:00
Dmitriy Zaporozhets 248ece76e5 gitlab_meta gem to 6.0 2013-06-22 16:48:34 +03:00
Dmitriy Zaporozhets 7b87fcbad4 Fix broken factory 2013-06-22 16:46:57 +03:00
Dmitriy Zaporozhets 529feb4b40 Add comment title to rss feed 2013-06-22 16:00:39 +03:00
Dmitriy Zaporozhets 96f3a88c01 Restrict auto generated routes 2013-06-22 15:11:23 +03:00
Dmitriy Zaporozhets 102aaf0682 Use simple render syntax in controllers 2013-06-22 15:08:11 +03:00
Dmitriy Zaporozhets edcd46599b Use simplified render syntax 2013-06-22 15:04:49 +03:00
Dmitriy Zaporozhets 9787c37aed More db index 2013-06-22 15:01:08 +03:00
Dmitriy Zaporozhets ac6c912860 Merge pull request #4385 from Razer6/fix_update_docs_for_master 
Fix wrong file versions in update docs (5.2 to 5.3)
 2013-06-22 04:45:41 -07:00
Robert Schilling 8c1ac6f3c6 Fix wrong file versions in update docs 2013-06-22 13:29:51 +02:00
Dmitriy Zaporozhets ee13297af2 Cleanup: removed unused routing/methods. Improved admin area usability 2013-06-22 14:11:20 +03:00
Dmitriy Zaporozhets 59f75e6c1e Remove unused accessor 2013-06-22 13:47:11 +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 19d628dd23 Set default order to authorized_project and authorized_groups 2013-06-22 13:39:34 +03:00
Dmitriy Zaporozhets c2317d6785 cache project.team.members 2013-06-22 12:57:05 +03:00
Dmitriy Zaporozhets 09daff6178 Colors for author additions/develtions in graph 2013-06-22 11:38:47 +03:00
Dmitriy Zaporozhets 8d70ac008d Merge branch 'master' into 6-0-dev 
Conflicts:
	VERSION
	db/schema.rb
 2013-06-22 11:19:12 +03:00
Dmitriy Zaporozhets f4e2865d2f Merge pull request #3408 from NARKOZ/patch-2 
add db index for authentication_token column in users table
 2013-06-22 01:14:07 -07:00
Dmitriy Zaporozhets 9de23248d8 You should not be able to remove a Group owner 2013-06-22 11:02:31 +03:00
Dmitriy Zaporozhets 1dd6606161 Send project transfer email to all members. Added specs for project move email 2013-06-22 10:56:51 +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 6577d3a49c Markdown now support users from groups 2013-06-22 00:06:21 +03:00
Dmitriy Zaporozhets fdf7fc044a Make it possible to assign/mention users from group members 2013-06-22 00:02:09 +03:00
Dmitriy Zaporozhets ede746bf07 prevent document unbind since it breaks rails ujs 2013-06-21 23:47:42 +03:00
Dmitriy Zaporozhets 4c9e47f6e0 Fix notifications for group projects 2013-06-21 23:36:02 +03:00
Dmitriy Zaporozhets 3208dad1e7 Respect group membership in notification service 2013-06-21 23:21:55 +03:00