home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,456 Commits 48 Branches 340 Tags
79dd7beebdfe2d729bfdc39ffaffc264a1a84f67
Commit Graph
8456 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 79dd7beebd Merge branch 'feature/public_groups' into 'master' 
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
 2014-02-24 19:37:13 +00:00
Dmitriy Zaporozhets 86e25595c8 Fix btn-group align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 17:44:25 +02:00
Dmitriy Zaporozhets aff7ac37ad Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-24 15:19:52 +02:00
Dmitriy Zaporozhets 9c41097665 Fix MR title buttons block 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 15:17:36 +02:00
Dmitriy Zaporozhets 36d7b20b8d Merge pull request #6390 from Razer6/add_missing_travis_task 
Add jasmine tests to postgresql db
 2014-02-24 15:01:35 +02:00
Dmitriy Zaporozhets 31386adf53 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:55:27 +02:00
Dmitriy Zaporozhets 6c660698eb Include 6.6.1 in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:21:34 +02:00
Dmitriy Zaporozhets ac98d74adb Merge branch 'file_css' into 'master' 
Better css class names for diff elements
 2014-02-24 11:50:21 +00:00
Dmitriy Zaporozhets 76ad6046f9 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:50:06 +02:00
Dmitriy Zaporozhets 05c5b77070 Fix submodules 500 error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:22:00 +02:00
Dmitriy Zaporozhets 6c8a17d06d Fix diff tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 12:17:39 +02:00
Dmitriy Zaporozhets 8290c9a67f Use proper classes for sdiff content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:51:50 +02:00
Dmitriy Zaporozhets 58634dfb6a New class names in notes css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:43:45 +02:00
Dmitriy Zaporozhets 71d4474684 Move diff css to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:36:22 +02:00
Dmitriy Zaporozhets 71e7bff1ea Revert "set layout margin-bottom 50px" 
Because .content class used in several other places and this change add
unnecessary margint ot it

This reverts commit f8807281ee.
 2014-02-24 09:32:24 +02:00
Dmitriy Zaporozhets 13fbf48892 Proper class names for diff files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:31:36 +02:00
Dmitriy Zaporozhets 40a8ae5e5f Merge branch 'refactor_css' into 'master' 
Refactor Css
 2014-02-24 07:24:14 +00:00
Robert Schilling e83fead6d1 Add jasmine tests to postgresql db 2014-02-23 14:30:06 +01:00
Dmitriy Zaporozhets e868de687d Its start for 6.7.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 19:45:28 +02:00
Dmitriy Zaporozhets 0538828fdd Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-21 19:43:13 +02:00
Dmitriy Zaporozhets 0ddf1d9dfd Merge branch 'feature/edit_from_mr' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-02-21 19:42:55 +02:00
Dmitriy Zaporozhets 96a9c0fc38 Merge branch 'styleguide' into 'master' 
Styleguide

As discussed.
 2014-02-21 17:41:29 +00:00
Dmitriy Zaporozhets d68525ff97 Merge pull request #6369 from skv-headless/postrgesql_travis_testing 
postgresql testing on travis
 2014-02-21 19:39:19 +02:00
Dmitriy Zaporozhets 2e198cc3f1 Merge pull request #6366 from popomore/patch-1 
set layout margin-bottom 50px
 2014-02-21 19:39:01 +02:00
Dmitriy Zaporozhets af0ed69045 Merge pull request #6372 from gemnasium/add_gemnasium_service 
Add support for Gemnasium as a project service
 2014-02-21 19:37:34 +02:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab 
Conflicts:

	db/schema.rb
 2014-02-21 16:25:22 +01:00
Dmitriy Zaporozhets 490f99d45e New stable branches and update guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0 		2014-02-21 17:07:43 +02:00
Dmitriy Zaporozhets 1a3527f6e7 Version to 6.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 17:02:38 +02:00
dosire 3af7254174 Markdown doesn't render correctly yet. 2014-02-21 15:38:05 +01:00
dosire 403298317f Merge branch 'master' into styleguide 
Conflicts:
	CONTRIBUTING.md
 2014-02-21 15:36:53 +01:00
dosire 77dc5de923 Solve conflict and add more explanations on how to contribute. 
Conflicts:
	CONTRIBUTING.md
 2014-02-21 15:34:38 +01:00
Dmitriy Zaporozhets bbd92f554d Limit huge images in diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 16:32:42 +02:00
skv-headless 544ce2d06a postgresql testing on travis 2014-02-21 14:32:06 +04:00
dosire 3c053bdc20 Add style guidelines in separte paragraph. 2014-02-21 11:05:37 +01:00
Haoliang Gao f8807281ee set layout margin-bottom 50px 2014-02-21 14:46:27 +08:00
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects. 
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
 2014-02-20 09:26:38 -06:00
Dmitriy Zaporozhets 4e15cbf463 Add changelog entry 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 16:42:22 +02:00
Dmitriy Zaporozhets e39f0de8ee Add edit button to MergeRequest diff 
It will redirect you to file edit page.
After submit changes you will be redirected back to merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 16:39:13 +02:00
Dmitriy Zaporozhets 138e2a50b7 PostgreSQL is first one now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 15:16:33 +02:00
Marin Jankovski e8466a21ca Merge branch 'case_sensitivity' into 'master' 
Case Sensitivity for MYSQL

#1014
 2014-02-20 12:18:22 +00:00
Dmitriy Zaporozhets 0f080a9410 Make sure note.system is false if created by user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 14:07:42 +02:00
Dmitriy Zaporozhets 32ecb02784 Refactor scss 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 13:51:22 +02:00
Marin Jankovski fcdcb1a675 Move database setup guide inside the installation. 2014-02-20 12:31:04 +01:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 13:05:33 +02:00
Marin Jankovski a7a2100f3d Doc syntax highlighting. 2014-02-20 10:51:58 +01:00
Marin Jankovski acdb808abc Update database documentation. 2014-02-20 10:10:25 +01:00
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Dmitriy Zaporozhets 499a118590 Time for rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0.rc1 		2014-02-20 10:24:31 +02:00
Dmitriy Zaporozhets dad6b0213c Mention new rails in changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 14:49:44 +02:00
Dmitriy Zaporozhets d353e203c8 Merge branch 'link-release-docs' into 'master' 
Link Release Docs
 2014-02-19 12:44:35 +00:00