home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,700 Commits 48 Branches 340 Tags
6bcb1a033fbb8d0d64ec040f2f21b78e7dd22ec6
Commit Graph
795 Commits
Author SHA1 Message Date
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets f56541de9a Revert "Create dev fixture projects with fixed visibility" 
This reverts commit a9fadce361.
 2014-11-10 16:17:04 +02:00
Dmitriy Zaporozhets 6641341b65 Merge pull request #8254 from cirosantilli/factor-get-shell-version 
Factor GITLAB_SHELL_VERSION get method
 2014-11-08 11:04:56 +02:00
Marin Jankovski 1d337defec Merge pull request #8168 from cirosantilli/dev-fixtures-visibility 
Create dev fixture projects with fixed visibility
 2014-11-07 15:26:48 +01:00
Valery Sizov bf8b874117 fix system silent call 2014-11-06 13:07:42 +02:00
Valery Sizov d1b489e048 Revert "Revert "Don't output to stdout from lib non-interactive methods"" 
This reverts commit b33d4bc2f1.
 2014-11-06 13:07:16 +02:00
Valery Sizov b33d4bc2f1 Revert "Don't output to stdout from lib non-interactive methods" 
This reverts commit 0b1084a453.
 2014-11-06 11:58:00 +02:00
Ciro Santilli f36db59d97 Factor GITLAB_SHELL_VERSION get method 2014-11-05 17:16:04 +01:00
Valeriy Sizov 2b00de710d Merge pull request #8236 from cirosantilli/rm-lib-stdout 
Don't output to stdout from lib non-interactive methods [failure unrelated]
 2014-11-05 16:24:50 +02:00
Ciro Santilli 0b1084a453 Don't output to stdout from lib non-interactive methods 
It pollutes the test output too much.
 2014-11-05 12:35:33 +01:00
Marin Jankovski 42a1d8083c Merge pull request #7516 from cirosantilli/update-regex-msg 
Update default regex message to match regex.
 2014-11-05 11:38:29 +01:00
Dmitriy Zaporozhets 876c6f2491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-04 10:48:38 +02:00
Ciro Santilli 71ed0ab069 Fix push not allowed to protected branch if 
commit starts with 7 zeros.
 2014-11-03 20:37:47 +01:00
Valery Sizov c9470f5c78 Ability to block commits with certain filenames 2014-11-03 18:22:43 +02:00
Valery SizovandValery Sizov a7f0160f9e git hook: code style 2014-11-03 14:41:07 +02:00
Dmitriy Zaporozhets e1c48f1431 Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-03 14:10:53 +02:00
Robert Schilling e9171fea85 Merge pull request #8217 from bbodenmiller/change-label-generation 
remove feature label
 2014-11-01 10:38:25 +01:00
Ben Bodenmiller 3e55d56c90 remove feature label 
For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
 2014-10-31 17:22:16 -07:00
Valery Sizov 76764338dd Git Hook to check whether author is a GitLab member 2014-10-31 16:19:58 +02:00
Ciro Santilli d549a2a525 Factor lib backend gitlab shell path 2014-10-31 13:00:50 +01:00
Andrey KrivkoandDmitriy Zaporozhets bafd30f92c Session API: Use case-insensitive authentication like in UI 2014-10-30 18:29:18 +02:00
Valery Sizov a62ad80a0f Git hooks for checking email 2014-10-29 11:42:51 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Valery Sizov 9a3d36505f Merge branch 'ee_master' into 7-4-stable-ee 
Conflicts:
	VERSION
 2014-10-27 13:17:14 +02:00
Ciro Santilli a9fadce361 Create dev fixture projects with fixed visibility 2014-10-26 11:34:50 +01:00
Jacob Vosmaer 4272926f55 Fix merge conflict in lib/gitlab/ldap/adapter.rb 2014-10-24 13:58:28 +02:00
Valery Sizov dd559674e2 Merge branch '7-4-stable-ee' into ce_stable 
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
 2014-10-24 13:37:25 +03:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Jacob VosmaerandValery Sizov e8da077d4f Fix LDAP authentication for Git HTTP access 
Conflicts:
	CHANGELOG
 2014-10-23 17:53:19 +03:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Jacob Vosmaer 6b2b20af41 Fix LDAP authentication for Git HTTP access 2014-10-23 14:21:58 +02:00
Robert Schilling 36649fc250 Merge pull request #8150 from cirosantilli/unecessary-variable-user 
Remove unused variable user at lib/gitlab/markdown
 2014-10-23 13:58:24 +02:00
Ciro Santilli 40815b2baf Remove unused variable user at lib/gitlab/markdown 2014-10-23 13:12:21 +02:00
Dmitriy Zaporozhets a6a0bb4f2d Merge branch '7-4-stable-ee' into 'master' 
7-4 stable-ee to master

See merge request !212
 2014-10-22 11:43:09 +00:00
Dmitriy Zaporozhets 829bd6ff38 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	lib/gitlab/ldap/adapter.rb
 2014-10-22 11:23:18 +03:00
Dmitriy Zaporozhets 37e09858e8 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:33 +03:00
Dmitriy Zaporozhets c5ad011917 Merge branch 'fix-ldap-check' into 'master' 
Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206
 2014-10-22 08:07:08 +00:00
Dmitriy Zaporozhets da21b9e7d0 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-21 18:26:40 +03:00
Robert Schilling d29dd2cfec Merge pull request #8117 from cirosantilli/improve-grack-comment 
Improve grack auth hooks comment.
 2014-10-21 13:10:00 +02:00
Ciro Santilli ce056d8074 Improve grack auth hooks comment. 2014-10-21 12:36:09 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names 
Factor admin logs [failure unrelated]
 2014-10-21 11:59:41 +03:00
Jan-Willem van der Meer 0f53615140 Make AD check server specific 2014-10-17 17:14:23 +02:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +02:00
Jan-Willem van der Meer b5430b8130 Properly fetch ldap groups 2014-10-15 14:52:07 +02:00
Jan-Willem van der Meer 9b678226a7 Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync 
Conflicts:
	db/schema.rb
	lib/api/ldap.rb
 2014-10-15 14:50:24 +02:00
Jan-Willem van der Meer 471054e1f5 Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master 
Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb
 2014-10-15 08:19:13 +02:00