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
Dmitriy Zaporozhets
5b26b45dcb
Improve group settings UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-29 21:30:20 +03:00
Marin Jankovski
17a696a98b
We need shortcuts route.
2014-05-29 12:01:34 +02:00
Marin Jankovski
a9580a157a
Use the correct links, replace in search.
2014-05-29 08:44:25 +02:00
Job van der Voort and Marin Jankovski
fd476cf620
render items from doc
2014-05-29 08:44:25 +02:00
Jacob Vosmaer
7dfb678df9
Revert "Actually use the 'user_filter' configuration option"
...
This reverts commit e9d4587ff1https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61 )
Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.
In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55 )
Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
2014-05-27 15:53:04 +02:00
dosire
040b3be5b1
Give a hint where to find the email settings.
2014-05-26 16:15:12 +02:00
Dmitriy Zaporozhets
695fd3cf2c
Move protected branches to Project settings
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-23 14:25:55 +03:00
Earle Bunao & Neil Calabroso and erbunao
6a85cdf162
Implements drag and drop upload in creating issues
2014-05-23 16:22:42 +08: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
sue445
a3d8be09c6
Fix can not automerge if description is too long
2014-05-11 23:50:14 +09:00
Dmitriy Zaporozhets
e640481625
Merge branch 'files_in_wiki' into 'master'
...
Add support to show files from wiki repository on wiki pages
2014-05-06 10:21:05 +00:00
Dmitriy Zaporozhets
c51ac0484f
Merge pull request #5962 from skv-headless/editing-preview
...
editing preview
2014-04-29 10:00:29 +03:00
Marin Jankovski
c4b1a5f5ea
Allow nested files in wiki.
2014-04-28 16:22:31 +02:00
Dmitriy Zaporozhets
5dd4fb82e8
Merge pull request #6847 from Philzen/patch-2
...
gitlab.yml description Typo
2014-04-24 20:56:30 +03:00
Marin Jankovski
fe1ca61601
Make sure that tests pass when aws group is used.
2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets
e54b457ea3
Improve ssh_host settings
2014-04-23 16:22:49 +02:00
Dmitriy Zaporozhets
2134e18ec6
Fix default ssh_host setting
2014-04-23 16:19:59 +02: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
3bb8c17cc3
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
2014-04-23 09:09:45 +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
Dmitriy Zaporozhets
972e40cc47
Merge branch 'bug-to-ldap-configuration' into 'master'
...
LDAP Configuration Fix
This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
2014-04-23 08:49:09 +00:00
Dmitriy Zaporozhets
e680911767
Merge pull request #6827 from demisx/master
...
Add ability to set different ssh host, if different from http/https
2014-04-23 10:04:08 +03:00
Dmitriy Zaporozhets
7fab63b41f
Merge branch 'namespace_redis_cache' into 'master'
...
Give the Rails cache its own Redis namespace
2014-04-23 07:00:01 +00:00
Philzen
baec3f9bd7
# Fix description Typo
2014-04-23 08:57:54 +02:00
Sytse Sijbrandij
7e10d01342
Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via-env-variable
...
Allow to overwrite location of gitlab.yml config file.
2014-04-22 13:52:00 +02:00
Travis Odom
e9d4587ff1
Actually use the 'user_filter' configuration option
2014-04-21 15:48:42 +00:00
Dmitri Moore
db86fe47ce
Add ability to set different ssh host, if different from http/https
2014-04-18 20:20:43 -07:00
Cyril Rohr
b29171d9ec
Allow to specify secret token via environment variable.
2014-04-15 19:27:25 +01:00
Cyril Rohr
4691285989
Allow to overwrite location of gitlab.yml config file.
2014-04-15 19:23:55 +01:00
skv-headless
d859d08094
Editing preview
2014-04-15 19:02:02 +04:00
Jacob Vosmaer
8d78662e69
Give the Rails cache its own Redis namespace
...
Before this change, Rails cache data was stored in a global Redis
namespace. As a consequence, clearing the Rails cache (`rake
cache:clear`) would also delete all Sidekiq queue data and session
storage. This change puts all Rails cache data in a `cache:gitlab`
namespace, making `rake cache:clear` safe again.
2014-04-15 15:53:14 +02:00
Dmitriy Zaporozhets
fd61e3e901
Merge branch 'routing-for-groups' into 'master'
...
Routing for groups
Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
2014-04-15 10:36:52 +00: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
GitLab
bb7df7663a
Add short path route for groups.
2014-04-13 17:46:41 +02: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
Marin Jankovski
4df1a10e90
Update development steps.
2014-04-08 11:17:19 +02:00
Marin Jankovski
aea3712e8d
Add option for disable standard signin.
2014-04-07 17:11:06 +02:00
Jacob Vosmaer
5163a8fcb9
Disable connection reaping for MySQL
...
On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
2014-04-07 12:32:24 +02:00
Dmitriy Zaporozhets
65cd9829ee
Remove MergeRequest observer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets
6ae2529041
Remove KeysObserver
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets
3faa14e7a7
Merge branch 'reduce-observers' into 'master'
...
Move issue create/update code to services
Reduce observers role in GitLab code
2014-04-02 17:54:27 +00:00
Marin Jankovski
1ad79393ad
Add print.css to asset precompile array.
2014-04-02 14:42:35 +02:00
Dmitriy Zaporozhets
0d41f6f0a3
Remove issue observer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-02 15:37:57 +03:00
Jacob Vosmaer
eeeaaa4bc1
Explain the default repository_downloads_path
2014-03-31 12:19:37 +02:00
Jeroen van Baarsen
Dmitriy Zaporozhets
Marin Jankovski
Job van der VoortandMarin Jankovski
Jacob Vosmaer
dosire
Earle Bunao & Neil Calabrosoanderbunao
sue445
Philzen
Travis Odom
Dmitri Moore
Cyril Rohr
skv-headless
GitLab
Arnaud ABELARD
Robert Schilling
Drew Blessing