home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
6973 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer 7b0feec29d Add 6.2 CE to EE update docs 2013-11-08 16:45:47 +01:00
Jacob Vosmaer ee2510e518 Update 6.2 update docs for EE 2013-11-05 18:20:05 +01:00
Dmitriy Zaporozhets e316324be5 EE changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-04 19:35:21 +02:00
Dmitriy Zaporozhets af562851a5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2013-11-04 14:26:51 +02:00
Dmitriy Zaporozhets abf60c4c80 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq 2013-11-04 14:26:42 +02:00
Dmitriy Zaporozhets a811a4fa0b Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-04 07:07:43 +00:00
Dmitriy Zaporozhets e3bf87d364 Merge branch 'improve/respect_ldap_filter' of /home/git/repositories/gitlab/gitlab-ee 2013-11-02 08:12:09 +00:00
Jacob Vosmaer 867785b492 Use gitlab-shell 1.7.4 2013-11-01 16:34:00 +01:00
Dmitriy Zaporozhets 2d56ef52d2 Require gitlab-shell 1.7.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 16:58:59 +02:00
Dmitriy Zaporozhets 33b041a346 Revert "Escape strings" 
This reverts commit 03141bfccc.
 2013-11-01 16:30:29 +02:00
Dmitriy Zaporozhets 9f9d9cff0d Revert "Best to escape strings not split them" 
This reverts commit 1ab324cb67.
 2013-11-01 16:30:18 +02:00
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 ccf9bfbfb9 Respect LDAP user filter for SSH and Git over HTTP 
Remove LDAP::User#blocked? method because it duplciate
existing functionality of LDAP::Access#allowed? method

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 15:01:14 +02:00
Dmitriy Zaporozhets 31736e9be8 Correctly escape search query 2013-11-01 14:14:33 +02:00
Dmitriy Zaporozhets a476bc7bc7 Shell escape code search 2013-11-01 14:14:24 +02:00
Dmitriy Zaporozhets 1bace9da9a Require gitlab-shell v1.7.3 2013-11-01 14:14:06 +02:00
Nigel KukardandDmitriy Zaporozhets 1ab324cb67 Best to escape strings not split them 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:38 +02:00
Nigel KukardandDmitriy Zaporozhets 03141bfccc Escape strings 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:30 +02:00
Dmitriy Zaporozhets 35068315c1 Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-01 12:03:58 +00:00
Jacob Vosmaer 7d0d9c650e Restore sidekiq rake tasks 2013-11-01 12:03:15 +01:00
Dmitriy Zaporozhets c485463526 Merge branch 'upstream/6-2-stable' of /home/git/repositories/gitlab/gitlab-ee 2013-10-31 15:06:12 +00:00
Dmitriy Zaporozhets 81ae87f6a6 Fix tests 2013-10-31 16:12:45 +02:00
Dmitriy Zaporozhets 996a417d91 Remove outdated group callback 2013-10-31 14:42:10 +02:00
Dmitriy Zaporozhets 44f1fec05a Fix db schema 2013-10-31 14:34:09 +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
Dmitriy Zaporozhets 9c3e95f6d9 Version to 6.2.2 v6.2.2 2013-10-31 11:28:25 +02:00
Dmitriy Zaporozhets a4d65885e7 Update gitlab_git to recent version 2013-10-31 11:26:45 +02:00
Dmitriy Zaporozhets a430680ad5 Allow set ldap_cn and ldap_access for new group via API 2013-10-30 17:45:18 +02:00
Dmitriy Zaporozhets 5011af461d Merge branch 'api/group_ldap_attrs' of /home/git/repositories/gitlab/gitlab-ee 2013-10-30 14:19:53 +00:00
Dmitriy Zaporozhets e0723f41b8 Docs for ldap_cn and ldap_access group attributes in API 2013-10-30 15:08:40 +02:00
Dmitriy Zaporozhets 23ade0074b Expose ldap_cn and ldap_access group attributes through API 2013-10-30 15:06:46 +02:00
Jacob Vosmaer 0fdfcb23fa Merge branch 'LDAPUsernameUID' of /mnt/ebs/repositories/subscribers/gitlab-ee 2013-10-29 10:50:06 +00:00
Oleg Girko b215350edf Set username field of users created from LDAP to uid attribute. 
The previous approach of making username from user part of
email address (part of address before '@') has the following limitations:
* username in email is not guaranteed to be unique,
* email could have nothing to do with user identity in LDAP
  (like presonal email on an external email service).
On the other hand, LDAP uid is guaranteed to be unique,
as it represents user's login name on Unix/Linux systems.

To understand this change, please note that gitlab_omniauth-ldap
Ruby gem uses the following mapping to store LDAP attrinbutes in auth info:
* dn attribute of LDAP entry is stored in uid attribute of auth info;
* uid attribute of LDAP entry is stored in nickname attribute of auth info.

Signed-off-by: Oleg Girko <oleg.girko@jolla.com>
 2013-10-29 03:11:17 +00:00
Dmitriy Zaporozhets f2a77a82b8 Version 6.2.1 v6.2.1 2013-10-28 13:14:29 +02:00
arulandDmitriy Zaporozhets 2f47049ddc Fix for issue #5431 2013-10-25 17:53:08 +03:00
Dmitriy Zaporozhets 3a9bda2ad7 Merge branch 'allow_empty_ldap_groups' of /home/git/repositories/gitlab/gitlab-ee 2013-10-22 16:11:56 +00:00
Jacob Vosmaer 0b85f54201 Allow LDAP groups to be empty 2013-10-22 17:29:37 +02:00
Dmitriy Zaporozhets 5123d706c2 Merge branch '6-2-stable' of github.com:gitlabhq/gitlabhq into 6-2-stable 2013-10-22 14:10:24 +03:00
Dmitriy Zaporozhets f896c2eb60 Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-10-22 09:11:12 +00:00
Jacob Vosmaer 7dbcc1e660 Use 2>&1 because Bash 3 does not support &>> 2013-10-22 10:31:17 +02:00
Jacob Vosmaer 4f5d905374 Merge pull request #5389 from alexyoder/patch-1 
change 6-1-stable to 6-2-stable in installation guide
 2013-10-21 10:04:32 -07:00
Alex Yoder 08fd2b957d change 6-1-stable to 6-2-stable 2013-10-21 13:00:05 -04:00
Dmitriy Zaporozhets 1a923fe02e Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhq v6.2.0 2013-10-21 08:04:33 +00:00
Dmitriy Zaporozhets 4aea30a6b5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-21 10:49:30 +03:00
Jacob Vosmaer af24fe915b Merge pull request #5380 from thestv/patch-1 
corrected the url of the init-script
 2013-10-21 00:22:45 -07:00
Dmitriy Zaporozhets 7210a34bc7 Version up to 6.2.0 2013-10-21 10:05:13 +03:00
Dmitriy Zaporozhets 92b3612025 Improve project_merge_requests.rb feature steps 2013-10-21 09:55:41 +03:00
Dmitriy Zaporozhets 584117aa87 Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq 2013-10-21 06:22:41 +00:00
Dmitriy Zaporozhets 5eadd14953 Merge pull request #5382 from nattster/patch-1 
Use init.d/gitlab script from 6-0-stable branch
 2013-10-20 22:48:14 -07:00
Natt Piyapramote e41f4a8480 Use init.d/gitlab script from 6-0-stable branch 
Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.

It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```
 2013-10-21 09:20:53 +07:00