Commit Graph
7958 Commits
Author SHA1 Message Date
Sytse Sijbrandij dcc6ff5bcd Merge branch 'doc/6-0-to-6-5' into 'master'
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
2014-01-22 15:04:27 +00:00
Jacob Vosmaer 96ed6c4569 Replace 6.0-to-6.4.md with 6.0-to-6.5.md 2014-01-22 16:00:50 +01:00
Dmitriy Zaporozhets 1018cbdc80 Add public assets to gitignore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 11:18:34 +02:00
Dmitriy Zaporozhets 51f06bad0b Version 6.5.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.5.0
2014-01-22 11:10:01 +02:00
Dmitriy Zaporozhets bcedc4858d Use 6-5 branch in installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 11:08:42 +02:00
Dmitriy Zaporozhets 6c5606d212 Merge branch 'remove-old-twitter' into 'master'
Remove Old Twitter
2014-01-22 09:02:16 +00:00
dosire 604b38cd0a Remove deprecated twitter handle. 2014-01-22 10:00:25 +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
Sytse Sijbrandij a68630e06a Merge branch 'user_principal_name' into 'master'
Explain how to use userPrincipalName as the username with AD
2014-01-21 13:56:09 +00:00
Jacob Vosmaer 1ee9442323 Further explain userPrincipalName settings 2014-01-21 13:33:29 +01:00
Dmitriy Zaporozhets 9cc9e9cd9a Update from 6.4 to 6.5 guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-21 13:30:33 +02:00
Jacob Vosmaer 7fe7897c56 Explain how to use AD userPrincipalName for logins 2014-01-21 12:25:12 +01:00
Dmitriy Zaporozhets 416c25871d More entries to CHANGELOG. Version to rc1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-21 12:36:50 +02:00
Dmitriy Zaporozhets edd95a0e74 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-21 12:27:39 +02:00
Dmitriy Zaporozhets 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch
Added support for Go's repository retrieval.
2014-01-21 02:27:21 -08:00
Sytse Sijbrandij 1d2af74578 Merge branch 'rephrase_ldap_check' into 'master'
Rephrase LDAP check script output
2014-01-21 10:18:56 +00:00
Jacob Vosmaer 2f4d0a3008 Rephrase LDAP check script output
The previous phrasing lead some people to believe that there is a limit
on the number of LDAP users that can sign in to a GitLab instance. That
is not the case; the limit in the check script only applies to the
diagnostic information result set, so that running `rake gitlab:check`
does not output thousands of LDAP users.
2014-01-21 11:05:03 +01:00
Dmitriy Zaporozhets afd2999373 Merge branch 'changelog-base64' into 'master'
Changelog Base64

Add O'Reilly sponsorship in CHANGELOG
2014-01-21 09:44:30 +00:00
Marc Radulescu f59fe341de add O'Reilly sponsorship in CHANGELOG 2014-01-21 10:20:05 +01:00
Jacob Vosmaer 97cb5459ce Merge branch 'clone-explanation' into 'master'
Explain where the memory recommendation comes from

The 250MB repo limit is caused by the git command line.

Also see MR !422
2014-01-20 15:04:17 +00:00
Dmitriy Zaporozhets b04d6c2e61 Merge pull request #6098 from jeromedalbert/master
Rename "Website url" labels to "Website"
2014-01-20 06:43:23 -08:00
Dmitriy Zaporozhets e44186209e Merge branch 'encouragement-during-install' into 'master'
Encouragement during install
v6.5.0.rc1
2014-01-20 14:28:19 +00:00
Dmitriy Zaporozhets 4e890e5baa Merge branch 'fix/selectbox_above' into 'master'
Fix select2 css for drop above style less than a minute ago
2014-01-20 14:27:38 +00:00
Dmitriy Zaporozhets 66d0db2e23 Merge branch 'bug/500_pagination' into 'master'
Fix 500 error on project issues and merge requests pages
2014-01-20 14:13:12 +00:00
Dmitriy Zaporozhets bb0f723741 Fix select2 css for drop above style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-20 15:41:18 +02:00
Jerome Dalbert 9697e5327f Rename "Website url" labels to "Website" 2014-01-20 13:05:19 +00:00
Bruno Albuquerque e77694bff3 Added a simple test to web_url_without_protocol. 2014-01-20 08:00:50 -05:00
Dmitriy Zaporozhets c308b7be5e Merge branch 'fix/assign_to_me_link' into 'master'
Fix assign-to-me link for MergeRequest form
2014-01-20 12:42:18 +00:00
Dmitriy Zaporozhets 74856d410e Merge branch 'import-doc' into 'master'
Import Doc
2014-01-20 12:26:02 +00:00
dosire 8d83322dd1 Explain the culprit and consequences of the 1GB memory recommendation. 2014-01-20 13:24:19 +01:00
Dmitriy Zaporozhets a0e3893d1b Fix assign-to-me link for MR form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-20 14:23:06 +02:00
Dmitriy Zaporozhets e583df5443 Dont override project_id params when use issues/mr filtering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-20 14:16:12 +02:00
Sytse Sijbrandij 88ebeb92c2 Merge branch 'cloning_is_still_the_same' into 'master'
Git clone performance is still the same
2014-01-20 12:14:22 +00:00
Jacob Vosmaer 3f6c64c81a Revert "Since the git clone code is more efficient now we do not need this warning anymore."
This reverts commit a757c4a24f.

While it is true that Grack memory use while sending data to a client
was improved, this does not change the fact that the Git processes
running on a GitLab server will use more memory for large repositories.
2014-01-20 13:06:32 +01:00
Dmitriy Zaporozhets 74187621ea Update kaminari
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-20 14:00:50 +02:00
Bruno Albuquerque fb782476f9 Change web_url_without scheme to web_url_without_protocol. 2014-01-20 06:26:34 -05:00
Dmitriy Zaporozhets 01b98970cd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-20 12:56:36 +02:00
Bruno Albuquerque b75401d591 Move Go specific meta tag after the atom feed code. 2014-01-20 05:45:17 -05:00
Sytse Sijbrandij 8de39b18a4 Merge pull request #6078 from sag47/irc_nicknames
Add IRC nicknames to channel admins
2014-01-20 02:37:15 -08:00
Sytse Sijbrandij 2a748d9a01 Merge branch 'ee_update_instructions' into 'master'
Add EE checkout instructions to update docs
2014-01-20 10:01:18 +00:00
dosire 2ddfa882c0 Better wording of the import instructions. 2014-01-20 10:44:40 +01:00
Jacob Vosmaer da817a1f56 Add EE checkout instructions to update docs 2014-01-20 10:38:16 +01:00
Dmitriy Zaporozhets bb9e01cba6 Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce 2014-01-20 07:20:07 +00:00
sinm 433fca6c5b Updated gitlab.yaml.example's issue_closing_pattern to single quotes
… (misused double quotes here)
2014-01-20 07:47:19 +03:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516
Better check on the validity of emails
2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets 25da1415d3 Merge branch 'jeromedalbert-add_website_url_to_user' 2014-01-19 20:24:02 +02:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-01-19 20:23:29 +02:00
Dmitriy Zaporozhets d95e56f05e Merge branch 'improve/search_autocomplete' into 'master'
Improve: Search autocomplete

* fetch options via ajax
* only show options related to user input
* add limit to amount of options
2014-01-18 22:12:55 +00:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
dosire 7f9081c108 Update select branch to GitLab look and explain why this guide is long so people are not discouraged. 2014-01-18 15:34:40 +01:00