Dmitriy Zaporozhets
b03b69e23e
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/assets/images/brand_logo.png
app/assets/stylesheets/sections/login.scss
app/controllers/projects/merge_requests_controller.rb
app/helpers/appearances_helper.rb
app/views/layouts/devise.html.haml
2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets
a6546f51e2
Default gix max size to 20mb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-07-15 20:59:47 +03:00
Dmitriy Zaporozhets
3780444ccb
Increase grit memory limit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-07-15 15:27:54 +03:00
Dmitriy Zaporozhets
a74b66cdee
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/models/group.rb
app/models/project.rb
features/steps/shared/project.rb
2014-07-10 23:43:42 +03:00
Marvin Frick
423960a435
adds spec for LDAPKeys (+4 squashed commits)
...
Squashed commits:
[812406c] fixes bug from last refactoring
[53e9508] hides "delete" button if a key is a LDAPKey
[bafc66b] refactores update_ssh_keys in own method
[7895858] makes name of ssh public key configurable
2014-07-08 12:41:12 +02:00
Oleg Girko and Marvin Frick
edaaac2f55
Make SSH keys synchronisation with LDAP not delete keys added by users.
...
This is done by using a separate LDAPKey model (inherited from Key)
for storing SSH keys which came from LDAP.
These keys can be viewed from user profile, but they can not be deleted.
Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com > (+2 squashed commits)
Squashed commits:
[52b3816] Made SSH key synchronisation with LDAP configurable.
Now it can be turned on or off using configuration option
sync_ssh_keys in ldap section.
The default is off to preserve compatibility with old behaviour.
Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com >
[02f988d] Synchronise LDAP users SSH keys from LDAP automatically.
SSH public keys are synchronised from sshPublicKey LDAP attribute
upon login attempt and during regular LDAP security checks.
New keys are added, old keys not present in LDAP are deleted.
Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com > (+1 squashed commit)
Squashed commits:
[f087fbc] Make Gitlab::LDAP::Person.entry method public.
This is needed to allow access control methods to access
arbitrary LDAP attributes.
Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com >
2014-07-08 12:31:11 +02:00
Sytse Sijbrandij
e12a517e83
Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour.
2014-07-01 16:20:07 +02:00
Sytse Sijbrandij
b5543be19d
Move standard login form to the auth settings where users expect them.
2014-07-01 14:49:40 +02:00
Marvin Frick
4be5c5a7a2
adds feature to sync GitLab admins with LDAP group
2014-06-23 18:17:14 +02:00
Dmitriy Zaporozhets
b165b097f5
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
LICENSE
VERSION
app/controllers/omniauth_callbacks_controller.rb
app/helpers/application_helper.rb
app/helpers/merge_requests_helper.rb
app/models/group.rb
app/models/project.rb
app/models/project_team.rb
app/views/admin/groups/edit.html.haml
app/views/groups/_projects.html.haml
app/views/groups/edit.html.haml
db/schema.rb
doc/install/installation.md
doc/integration/README.md
lib/gitlab/git_access.rb
lib/gitlab/markdown.rb
spec/helpers/merge_requests_helper.rb
spec/models/merge_request_spec.rb
2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets
7be80fd899
Enable identicon for gravatar by default
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-06-17 09:27:50 +03:00
Dmitriy Zaporozhets
1355ede49d
Wipe wall notes feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-06-13 14:24:54 +03:00
Jeroen van Baarsen
65cf5957de
Removed the Support Email setting
...
This setting was not longer used in GitLab, so i think it can be
removed.
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2014-05-30 20:11:07 +02:00
dosire
040b3be5b1
Give a hint where to find the email settings.
2014-05-26 16:15:12 +02:00
Marin Jankovski
95ef8f9756
Merge remote-tracking branch 'ce/master'
...
Conflicts:
VERSION
doc/install/installation.md
doc/integration/README.md
doc/integration/external-issue-tracker.md
lib/gitlab/markdown.rb
spec/lib/gitlab/ldap/ldap_access_spec.rb
2014-05-21 13:10:37 +02:00
Marin Jankovski
dbd88d453b
Update the examples to example.com
2014-05-16 12:57:32 +02:00
Marin Jankovski
636ec6d3a0
Update warnings about relative url support.
2014-05-13 17:59:08 +02:00
Marin Jankovski
d41fba4d37
Add warning to gitlab.yml related to gzip assets and relative links.
2014-05-13 17:08:59 +02:00
Marin Jankovski
e3f736d258
Add Jira service.
2014-05-13 12:12:16 +02:00
Dmitriy Zaporozhets
556ca35274
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
VERSION
app/assets/stylesheets/application.scss
app/views/layouts/devise.html.haml
2014-05-12 12:39:51 +03:00
Dmitriy Zaporozhets
5dd4fb82e8
Merge pull request #6847 from Philzen/patch-2
...
gitlab.yml description Typo
2014-04-24 20:56:30 +03:00
Dmitriy Zaporozhets
7c1c03888c
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
2014-04-23 09:21:52 +00:00
Dmitriy Zaporozhets
3295a4db9d
Merge branch 'email_in_gravatar_urls' into 'master'
...
allow passing user's email address in custom Gravatar urls
Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and gravatar.ssl_url in the config file like this:
```
gravatar:
enabled: true
plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size} "
ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size} "
```
It's a only a 2 word patch.
2014-04-23 08:52:15 +00:00
Philzen
baec3f9bd7
# Fix description Typo
2014-04-23 08:57:54 +02:00
Dmitriy Zaporozhets
c4e713a5b6
Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee
...
Conflicts:
VERSION
db/schema.rb
doc/install/installation.md
2014-04-22 11:58:11 +02:00
Dmitri Moore
db86fe47ce
Add ability to set different ssh host, if different from http/https
2014-04-18 20:20:43 -07:00
Dmitriy Zaporozhets
92b5e6b3bf
Merge branch 'link-to-oauth-doc' into 'master'
...
Link to oauth doc
Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
2014-04-14 13:19:00 +00:00
Arnaud ABELARD
5d7bdf7642
allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
...
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size} "
add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
2014-04-12 23:10:45 +02:00
Robert Schilling
e9409d1f4d
Synchronize default issue closing pattern in documetation and implementation, fixes #6742
2014-04-11 23:13:21 +02:00
dosire
db1be88f21
Link to the doc.
2014-04-10 14:39:58 +02:00
Drew Blessing
728b05cab7
Add OmniAuth Documentation
...
Add GitHub OmniAuth docs
Google instructions
Google instructions
Merge master
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Add Google and Twitter docs
Add screenshot
Add screenshot
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Finalize current docs
Finalize current docs
Add existing user information
Add twitter
Add twitter
Add Twitter disclaimer
Add Twitter disclaimer
remove old doc
Remove unnecessary link
Revert omniauth provider format
Add OmniAuth Documentation
Add GitHub OmniAuth docs
Google instructions
Google instructions
Merge master
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Add Google and Twitter docs
Add screenshot
Add screenshot
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Clean things up
Finalize current docs
Finalize current docs
Add existing user information
Add twitter
Add twitter
Add Twitter disclaimer
Add Twitter disclaimer
remove old doc
Remove unnecessary link
Revert omniauth provider format
Use omniauth again
Remove notice
Restore whitespace
Slight changes
2014-04-10 07:31:54 -05:00
Dmitriy Zaporozhets
fae2e540b6
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
Gemfile.lock
README.md
VERSION
app/assets/javascripts/application.js
db/schema.rb
doc/install/installation.md
doc/update/4.2-to-5.0.md
doc/update/5.0-to-5.1.md
doc/update/5.1-to-5.2.md
doc/update/5.2-to-5.3.md
doc/update/5.4-to-6.0.md
doc/update/6.0-to-6.1.md
doc/update/6.0-to-6.7.md
lib/gitlab/git_access.rb
2014-04-10 13:34:56 +03:00
Marin Jankovski
aea3712e8d
Add option for disable standard signin.
2014-04-07 17:11:06 +02:00
Jacob Vosmaer
eeeaaa4bc1
Explain the default repository_downloads_path
2014-03-31 12:19:37 +02:00
Jacob Vosmaer
200eeea258
Make the repository downloads path configurable
2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets
e502d785f9
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
VERSION
app/controllers/application_controller.rb
app/models/user.rb
app/views/groups/members.html.haml
app/views/groups/show.html.haml
config/gitlab.yml.example
db/schema.rb
features/steps/project/project_browse_branches.rb
lib/api/projects.rb
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/person.rb
lib/gitlab/upgrader.rb
2014-03-18 11:15:01 +02:00
Dmitriy Zaporozhets
b1ff8e31b1
Add ldap check in application_controller and internal api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-10 17:10:23 +02:00
Dmitriy Zaporozhets
d36669d8ea
Merge pull request #6420 from Seklfreak/add-piwik-support
...
Added Piwik Integration
2014-02-26 18:19:25 +02:00
Dmitriy Zaporozhets
6ef3505b19
Add default settings to test env. Removed wrong comment for rack_profiler
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-26 12:44:29 +02:00
Sebastian Winkler
64e4b400d0
Added Piwik support
2014-02-23 15:13:38 +01:00
Dmitriy Zaporozhets
903726c846
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
Gemfile
VERSION
app/models/group.rb
app/views/groups/edit.html.haml
db/schema.rb
doc/install/installation.md
doc/update/5.4-to-6.0.md
2014-02-11 10:15:13 +02:00
Jacob Vosmaer
4fdafcaf8a
Merge pull request #5842 from vikraman/patch-1
...
Add comment about tls for ldap method
2014-01-29 10:24:59 -08:00
dosire
c62892b225
People keep adding http:// in front of the host.
2014-01-27 14:27:47 +01:00
dosire
4fc17cf13f
Reword the git explanation.
2014-01-27 13:01:20 +01:00
Dmitriy Zaporozhets
741d50dd77
Merge branch '6-5-stable' of dev.gitlab.org:gitlab/gitlabhq
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
VERSION
doc/install/installation.md
2014-01-23 09:42:03 +02:00
dosire
7ad70a56d3
Git over ssh and http are different things.
2014-01-22 17:51:00 +01:00
dosire
119c782e0b
More explanation for upload limits.
2014-01-22 17:01:47 +01:00
Dmitriy Zaporozhets
d4e82f5e11
Merge pull request #6094 from sinm/patch-1
...
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
2014-01-22 00:19:05 -08:00
Dmitriy Zaporozhets
2df9a76042
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
VERSION
app/assets/stylesheets/generic/common.scss
app/views/projects/edit.html.haml
config.ru
db/schema.rb
doc/install/installation.md
doc/update/6.0-to-6.1.md
doc/update/6.1-to-6.2.md
lib/gitlab/upgrader.rb
2014-01-21 18:15:49 +02:00
Jacob Vosmaer
1ee9442323
Further explain userPrincipalName settings
2014-01-21 13:33:29 +01:00
Dmitriy Zaporozhets
Marvin Frick
Oleg GirkoandMarvin Frick
Sytse Sijbrandij
Jeroen van Baarsen
Marin Jankovski
Philzen
Dmitri Moore
Arnaud ABELARD
Robert Schilling
Drew Blessing
Jacob Vosmaer
Sebastian Winkler