home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,585 Commits 48 Branches 340 Tags
ec56ebb4cd3d413095a98e0ceae4f6d062e22521
Commit Graph
3640 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9d97224941 Project share UI: Replace groups list with selectbox 2013-10-16 14:17:41 +03:00
Dmitriy Zaporozhets db93bec3fe Add group_access validation to ProjectGroupLink 2013-10-03 10:04:07 +03:00
Dmitriy Zaporozhets 172eb64deb LDAP user filter option in gitlab.yml 
Now you are able to specify LDAP user filter string in gitlab.yml.
So its possible to exclude some users from accessing gitlab.
If user with LDAP account not matching this filter will try to login or
use gitlab he will get error message like 'Access denied for your LDAP
account' and will be signed out.
 2013-10-01 14:45:21 +03:00
Dmitriy Zaporozhets 89654431ea Group#ldap_cn selectbox with ajax autocomplete via api 2013-10-01 12:04:14 +03:00
Dmitriy Zaporozhets 538b76972a LDAP groups select js 2013-10-01 11:07:45 +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
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00
Johannes Becker 35597f61aa Simple PivotalTracker Source Commits Service 2013-09-25 00:56:25 +02:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +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 a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Dmitriy Zaporozhets df92d4ff67 Merge pull request #5072 from jbornschein/proj-new-public 
Add "public-project?" checkbox to new-project view
 2013-09-14 06:19:56 -07:00
Joerg Bornschein c71460d2d3 Use ruby 1.9 hash syntax 2013-09-14 13:28:15 +02:00
Dmitriy Zaporozhets c479b1dd1f Merge pull request #5051 from jbornschein/patch-1 
Minor UI fix in views/public/project/index.html.haml
 2013-09-14 00:17:24 -07:00
Dmitriy Zaporozhets 6df16564ef Merge pull request #5076 from jzi/notify_commit_author 
Re-enable notifying commit authors of new commit notes
 2013-09-14 00:06:43 -07:00
Jakub Zienkiewicz 49f609a936 notify commit author of new notes 2013-09-13 15:38:37 +02:00
Joerg Bornschein 83b212a4ef Add public-project? checkbox to new-project view 2013-09-13 14:39:04 +02:00
Joerg Bornschein 8199be83f5 Fix default settings when creating new Project 2013-09-13 13:02:37 +02:00
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets e1ca9de0da Add default values to compare page link 2013-09-12 21:46:31 +03:00
Dmitriy Zaporozhets 839c3b198e Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets 069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets ed72e949f2 Right branches for mr link at Compare view 2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets f774949d3f Compare page improved 
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
 2013-09-12 20:15:10 +03:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 8589824f00 Add UsersGroup observer 
Trigger notification service when new user-group relation was created
 2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets edb3368c93 Merge pull request #5048 from Nullreff/image-diff 
Fix bug with rendering changing images in commits
 2013-09-12 07:05:16 -07:00
Dmitriy Zaporozhets 4f9bc937b3 Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 14:01:21 +00:00
Jörg Bornschein 811622346b Minor UI change in iews/public/project/index.html.haml 
Placeholder in search field was wrong
 2013-09-12 13:33:09 +02:00
Ryan Mendivil 0a05ab9126 Fix bug with rendering changing images in commits 
When viewing the diff for a changed image file, two bugs occur:

- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error

The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'.  The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
 2013-09-11 18:53:37 -08:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets 4002561e17 New landing page when you have 0 projects 2013-09-11 22:20:51 +03:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Dmitriy Zaporozhets 73446fe15e Email templates when user was added to group 2013-09-11 21:17:28 +03:00
Izaak Alpert 810851f574 Style updates 
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
 2013-09-11 14:04:15 -04:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Dmitriy Zaporozhets 694768e518 Fix 404 if Group guest visit empty group page 2013-09-11 21:00:16 +03:00
Dmitriy Zaporozhets c2c11e655f Merge pull request #5041 from stecman/several-namespaces-fix 
Fix user.several_namespaces? to work with multiple ownership of groups
 2013-09-11 06:51:59 -07:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12: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 c7cb7599e2 Merge pull request #5022 from amacarthur/config-public-project 
make public/private setting for project creation configurable
 2013-09-10 08:21:37 -07:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets a30ce86690 Improve commits list UI 2013-09-10 10:17:15 +03:00
Angus MacArthur cfe13a0d9f update to project creation page to reflect default public project setting 2013-09-09 16:26:27 -04:00