Valery Sizov
eed0b3b593
Merge branch '7-4-stable' into ee_stable
2014-10-21 14:39:35 +03:00
Marin Jankovski and Valery Sizov
536f61e0e7
Add test for allowed team name of slack.
2014-10-21 14:35:13 +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
fad588f2be
Remove LDAP save test
...
This is handled within the LDAP class
2014-10-16 17:18:40 +02:00
Jan-Willem van der Meer
02fb3116d5
Add provider to LdapGroupLink tests
2014-10-16 12:28:47 +02:00
Jan-Willem van der Meer
8b98e9dc46
Make ldap group link factory valid
2014-10-16 12:11:08 +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
435b6f9135
Remove pending status from test
2014-10-15 14:25:06 +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
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
23b692c701
Add specs for authentication and config
2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer
5e1c39cb78
Merge tests to support Multiple LDAP groups
2014-10-13 17:33:44 +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
05fca6bfc2
Merge branch 'sorting-users-in-admin' into 'master'
...
Sorting users in admin
See merge request !1170
2014-10-13 13:59:17 +00:00
Valery Sizov
4e0da2325b
Admin: user sorting
2014-10-13 16:07:57 +03: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
4731d77bb2
Merge pull request #8020 from mr-vinn/note-trunc-link
...
Improve event note display in dashboard and project activity views
2014-10-13 11:40:50 +03:00
Vinnie Okada
b3c70d001d
Improve dashboard note view and add tests
...
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.
Also add Rspec tests for `EventsHelper#event_note`.
2014-10-12 23:56:56 -05:00
Dmitriy Zaporozhets
b956605f9e
Merge branch 'ambiguous-sha' into 'master'
...
Fix ambiguous sha problem with mentioned commit
Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.
- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown
Fixes #1644
See merge request !1171
2014-10-12 20:28:21 +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
b02c21df5c
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-12 21:49:20 +03: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
55526227d4
Adapt frontend to LdapGroupLink with provider
2014-10-10 21:50:54 +02:00
Marin Jankovski
2ea166fc33
Make sure relative url and asset_host are honored, specs.
2014-10-10 17:31:47 +02:00
Dmitriy Zaporozhets
0852d5e480
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-10 16:36:06 +03:00
Dmitriy Zaporozhets
ea04ed7879
Use 8chars short sha for commit in views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets
0189be0831
Use short_id instead of [0..N] for short version of commit sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-10 15:39:48 +03:00
Jan-Willem van der Meer
3702eb5443
Add new endpoint for specific ldap group listing
2014-10-10 13:03:21 +02:00
Jan-Willem van der Meer
89ac11df5c
Merge branch 'feature-multi-ldap-servers' into feature-multiple-ldap-push-authentication
2014-10-10 12:22:46 +02:00
Jan-Willem van der Meer
f06a60e2ad
Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers
2014-10-10 12:05:11 +02:00
Jan-Willem van der Meer
d059f50d4c
Refactor OAuth refactorings to CE
2014-10-10 12:03:32 +02:00
Jan-Willem van der Meer
70efa16a0c
More specific check for generated email
2014-10-10 12:00:37 +02:00
Jan-Willem van der Meer
74e79105cd
Cleanup provider validation
2014-10-10 11:31:33 +02:00
Jan-Willem van der Meer
8271fac0a9
Make AD check for access work properly
2014-10-10 10:46:07 +02:00
Marin Jankovski
1d14676e0c
Substitute right single quote back with apostrophe.
2014-10-10 08:24:58 +02:00
Jan-Willem van der Meer
19d811e6bf
Make LDAP authentication work with multiple LDAP servers
2014-10-09 19:09:36 +02:00
Valery Sizov
82c938ad75
annotate
2014-10-09 18:22:20 +03:00
Marin Jankovski
a912308340
Add a test for apostrophe in code blocks.
2014-10-09 16:12:17 +02:00
Valery Sizov
47f539f5a6
Snippets: public/internal/private
2014-10-09 17:09:53 +03:00
Marin Jankovski
64e72af3cb
Replace apostrophe with right single quote to avoid markdown interpretation as issue 39.
2014-10-09 14:20:49 +02:00
Marin Jankovski
099cf3558f
Failing test for apostrophe at the end of user mention on project with issue iid 39.
2014-10-09 14:02:10 +02:00
Jan-Willem van der Meer
6373c84d5f
Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers
...
Conflicts:
app/models/user.rb
config/gitlab.yml.example
spec/lib/gitlab/ldap/access_spec.rb
2014-10-09 12:26:19 +02:00
Jan-Willem van der Meer
429f9dfac3
Removed duplicated enabled
2014-10-09 10:36:10 +02:00
Jan-Willem van der Meer
ddb46f48f3
Explain auth logic some more
2014-10-08 16:09:29 +02:00
Jan-Willem van der Meer
c0229e46a3
Adapt ldap_user? to multiple ldap providers
2014-10-08 16:07:49 +02:00
