home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,953 Commits 48 Branches 340 Tags
c485463526212c015175e92dcc4516e4d8fc44b5
Commit Graph
6953 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stefan Baust 511f666fc4 corrected the url of the init-script 2013-10-20 21:10:51 +02:00
Dmitriy Zaporozhets 9f7757ed24 Fix rspec test after bdd3513f03 2013-10-20 18:29:11 +03:00
Dmitriy Zaporozhets bdd3513f03 Merge pull request #5373 from rtripault/milestone-iid 
Show milestones iid instead of id
 2013-10-20 07:56:45 -07:00
Dmitriy Zaporozhets 131aff76e0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-20 17:55:49 +03:00
Dmitriy Zaporozhets e247a7c9eb Merge pull request #5377 from tsigo/autocomplete_refactor 
Refactor search_autocomplete_source
 2013-10-20 07:53:18 -07:00
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04: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
Jacob Vosmaer d4d1bce5ec Skip rdoc to speed up Ruby compilation 2013-10-18 18:04:58 +02:00
Jacob Vosmaer 898e2acd33 Merge pull request #5363 from Razer6/logrote_for_update_docs 
Add logrotate config to update docs
 2013-10-18 06:37:21 -07:00
Robert Schilling 3ee4701316 Add logrotate config to update docs 2013-10-18 15:22:23 +02:00
Marin Jankovski 728f0c2005 Add smtp settings override in smtp_settings sample file. 2013-10-18 09:49:55 +02:00
Dmitriy Zaporozhets 4f2c469946 Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq 2013-10-18 07:14:39 +00:00
Marin Jankovski 1712406f8a Add an example. 2013-10-18 09:11:37 +02:00
Dmitriy Zaporozhets 05ca0a3147 Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab/gitlabhq 2013-10-18 06:29:28 +00:00
Dmitriy Zaporozhets 2cd3d42181 Use gitlab_config intead of Gitlab.config.gitlab in views 2013-10-17 22:11:41 +03:00
Sytse SijbrandijandDmitriy Zaporozhets 164f9d8760 Add warning for issue visibility. 2013-10-17 17:33:57 +03:00
Dmitriy Zaporozhets 318f96a40d Merge branch 'fix_sidekiq_process_count' of /home/git/repositories/gitlab/gitlabhq 2013-10-17 12:59:26 +00:00
Dmitriy Zaporozhets 2be2558c0c Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq 2013-10-17 12:58:35 +00:00