Valery Sizov
1a97c3c4aa
Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict
...
Conflicts:
CHANGELOG
VERSION
2014-10-29 16:13:36 +02:00
Dmitriy Zaporozhets and Valery Sizov
a2dfff418b
Dont allow guests..developers to manage group members
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-29 16:00:55 +02:00
Dmitriy Zaporozhets and Valery Sizov
995d198419
Split group members api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-29 16:00:46 +02: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 Vosmaer and Valery Sizov
16a10eb1cd
Fix LDAP config lookup for provider 'ldap'
2014-10-24 12:53:32 +03:00
Jacob Vosmaer and Valery Sizov
e8da077d4f
Fix LDAP authentication for Git HTTP access
...
Conflicts:
CHANGELOG
2014-10-23 17:53:19 +03:00
Dmitriy Zaporozhets
d79c5f78b6
Make gitlab ldap check work for old and new syntax
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-22 13:15:28 +03:00
Dmitriy Zaporozhets
86d9a782e8
Merge branch 'ee-stable-fix-ldap-check' into '7-4-stable-ee'
...
Fix ldap check [stable]
See merge request !214
2014-10-22 10:12:20 +00:00
Dmitriy Zaporozhets
ba22e3ae58
Merge branch 'stable-fix-ldap-check' into '7-4-stable'
...
Fix ldap check [stable]
Fix ldap check for stable branch
See merge request !1208
2014-10-22 09:56:59 +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
4c034142a1
Make gitlab ldap check work for old and new syntax
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-22 11:12:46 +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
Valery Sizov
91402ac0eb
Merge branch '7-4-stable' into ee_stable
2014-10-21 13:48:16 +03:00
Ciro Santilli and Dmitriy Zaporozhets
db5ea013f4
Use :message key, not :error for File::Service.
2014-10-21 11:37:15 +03:00
Valery Sizov
e769822595
Merge branch '7-4-stable' into to_ee_stable_from_ce_stable
...
Conflicts:
config/initializers/1_settings.rb
config/initializers/7_omniauth.rb
features/admin/groups.feature
features/steps/admin/groups.rb
2014-10-20 19:59:36 +03:00
Jacob Vosmaer and Dmitriy Zaporozhets
082d59d21f
Ask the wiki repo, not Gollum, if it's empty
...
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
2014-10-20 16:37:20 +03: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
Jan-Willem van der Meer
104e146268
Merge branch 'feature-multi-ldap-servers-group-sync' into feature-migrate-to-multiple-ldaps
2014-10-16 10:46:17 +02:00
Jan-Willem van der Meer
f4c64d44c2
Migrate LDAP users as well
2014-10-16 10:45:46 +02:00
Jan-Willem van der Meer
09ccea3590
Remove duplicated comment
2014-10-15 22:42:51 +02:00
Jan-Willem van der Meer
7d3976eec4
Add task to migrate LDAP group links to multiple LDAP setup
...
This still requires some additional documentation
2014-10-15 15:28:54 +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
Jan-Willem van der Meer
d9a8789166
Fix JIRA issue parsing
2014-10-15 07:49:35 +02:00
Jan-Willem van der Meer
c1865b69cd
Fix merge conflicts
...
Due to the complicated merge, part of the new functionalilty is inserted here
2014-10-14 23:41:07 +02:00
Jan-Willem van der Meer
4ace6dbf6c
Fix merge conflicts
2014-10-14 17:31:28 +02:00
Jan-Willem van der Meer
b01e4a1c90
Move method to match with CE
2014-10-14 17:27:13 +02:00
Dmitriy Zaporozhets
f4d43ed3b1
Merge branch 'master' into ce-upstream
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/projects/services_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/user.rb
app/views/admin/users/index.html.haml
app/views/projects/services/_form.html.haml
config/gitlab.yml.example
config/initializers/1_settings.rb
lib/gitlab/git_access.rb
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/person.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/ldap/access_spec.rb
2014-10-14 18:23:51 +03:00
Jan-Willem van der Meer
6ce65a3e95
Use Hash syntax for LDAP server declaration
2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer
9bf7bfda20
Remove unused methods
2014-10-14 12:09:24 +02:00
Jan-Willem van der Meer
ab04096c6c
Add explaining note to authentication method [skip ci]
2014-10-14 11:16:47 +02:00
Jan-Willem van der Meer
18d2ee31e8
Use server specific uid
2014-10-14 10:54:43 +02:00
Jan-Willem van der Meer
d3056feb11
Make sure the filters are applied
2014-10-14 10:08:47 +02:00
Jan-Willem van der Meer
b229b0f003
Fix authorization for LDAP login
2014-10-14 09:40:35 +02:00
Jan-Willem van der Meer
93505f7d04
DRY find method to find Gitlab user
2014-10-14 09:05:29 +02:00
Jan-Willem van der Meer
410d6e306b
Remove unused method
2014-10-14 08:54:15 +02:00
Marin Jankovski
51f9f4807b
Remove unecessary nesting.
2014-10-14 08:24:48 +02:00
Jan-Willem van der Meer
01b791237c
Refactor lib files for multiple LDAP groups
2014-10-13 17:24:05 +02:00
Dmitriy Zaporozhets
9229893c8a
Merge branch 'feature-oauth-refactoring' into 'master'
...
Feature oauth refactoring
same MR as gitlab/gitlab-ee!188
See merge request !1169
2014-10-13 11:46:45 +00:00
Dmitriy Zaporozhets
7a01d0cc74
Merge branch 'bug_with_apostrophe' into 'master'
...
Bug with apostrophe when at mentioning users
This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`.
Fixes #1034
See merge request !1165
2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets
b09fd2337a
Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'
...
Enabling markdown pipelines from gitlab
Define which markdown pipelines are used in GitLab from application instead from gem.
See merge request !1164
2014-10-12 18:33:27 +00:00
Jan-Willem van der Meer
9b9925bbec
Update groups only by own provider
2014-10-10 23:22:27 +02:00
Marin Jankovski
2ea166fc33
Make sure relative url and asset_host are honored, specs.
2014-10-10 17:31:47 +02:00
Jan-Willem van der Meer
83a3facb17
Add provider to LDAP group links
2014-10-10 16:16:29 +02:00
Jan-Willem van der Meer
757d9aacb5
Call the correct authentication method
2014-10-10 15:02:31 +02:00
Jan-Willem van der Meer
3702eb5443
Add new endpoint for specific ldap group listing
2014-10-10 13:03:21 +02:00
