Commit Graph
10172 Commits
Author SHA1 Message Date
Marin Jankovski 37e2fb81c2 Link jira doc to integration readme. 2014-05-23 13:03:10 +02:00
Jacob Vosmaer 7c0b84af5e Update 6.9.0-ee Debian packages 2014-05-22 19:10:38 +02:00
Marin Jankovski c5d833f06e Fix version 2014-05-22 15:58:26 +00:00
Marin Jankovski dc5cb4be24 Merge branch '6-9-packages' into 'master'
6.9.0 EE packages
2014-05-22 13:51:32 +00:00
Marin Jankovski 6e3d1f929d Packages for EE 6.9.0 2014-05-22 13:20:05 +02:00
Sytse Sijbrandij 33bfe3c175 Merge branch 'change-image-reference' into 'master'
Change image reference
2014-05-22 10:04:55 +00:00
dosire 56381ce6c4 Forgot to change the image reference. 2014-05-22 12:04:28 +02:00
Sytse Sijbrandij 534b9a177c Merge branch 'no-jpg' into 'master'
No jpg
2014-05-22 10:01:12 +00:00
dosire 71b0809837 jpg images are not supported by doc-gitlab-com 2014-05-22 12:00:45 +02:00
dosire d234c2364d fix merge conflict. 2014-05-22 10:47:59 +02:00
dosire 5726f4df22 Screenshots in subdirectory don't work with the doc server. 2014-05-22 10:45:55 +02:00
Sytse Sijbrandij fa87edd580 Merge branch 'ci-dev-info' into 'master'
Ci dev info
2014-05-22 08:38:36 +00:00
dosire a7ca07012c Add development info on how to make a CI tool project service. 2014-05-22 10:16:43 +02:00
Marin Jankovski 6ad20a1798 Merge remote-tracking branch 'ce/6-9-stable' 2014-05-22 10:13:31 +02:00
Marin Jankovski 7ab468317b Merge branch 'ldap_email_downcase' into 'master'
Fix LDAP email upper case bug
2014-05-22 06:59:13 +00:00
Jacob Vosmaer cd3fb5ff75 Add a changelog entry for the LDAP upper case bug 2014-05-21 14:27:05 +02:00
Jacob Vosmaer e52e5da88c Downcase the LDAP email address before comparing 2014-05-21 14:21:25 +02:00
Jacob Vosmaer 4ce8287e02 Add failing spec for upper case LDAP emails 2014-05-21 13:51:58 +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
Sytse Sijbrandij 9f80ab8e75 Merge branch 'dev-setup-on-metal' into 'master'
Dev setup on metal
2014-05-21 11:06:40 +00:00
dosire 60053e6e2c It now is a metal dev install. 2014-05-21 13:06:12 +02:00
Dmitriy Zaporozhets f420ae4b18 Merge branch 'cloud-com' into 'master'
Cloud com
2014-05-21 10:02:19 +00:00
dosire 13761caead Fixed spelling mistake in readme with a whole room watching. 2014-05-20 20:51:35 +02:00
Jacob Vosmaer 3199ef079c Merge branch 'deploy-key-projects' into 'master'
Deploy key in multiple projects

Add doc on adding a deploy key easily to multiple projects through the API.
2014-05-20 16:19:09 +00:00
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master'
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets 2e8f4bf392 Merge branch 'milestome-ui' into 'master'
Improve Milestome UI

Milestone UI header was different from Issue/MR pages but use same UI elements.
This MR fixes it so UI looks same for issue/mr/milestone
2014-05-20 13:30:42 +00:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:22:47 +03:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:21:30 +03:00
dosire ce8e7d280b Change cloud into .com 2014-05-20 14:30:25 +02:00
Dmitriy Zaporozhets 761fbbfeea Merge branch 'fix-install-guide' into 'master'
Fix install guide

Fix gitlab setup. DB setup must go after gitlab-shell setup. Because in seeds we need `/home/git/repositories` to exist
2014-05-20 09:10:37 +00:00
Dmitriy Zaporozhets c05117d9a2 Merge branch 'create_pg_indexes' into 'master'
Rebuild Postgres indexes after a MySQL conversion
2014-05-20 09:10:08 +00:00
Dmitriy Zaporozhets 5d77088202 Do gitlab:shell setup before seeds because we need /home/git/repositories exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 12:00:23 +03:00
Job van der Voort ea109704d1 everything in header 2014-05-19 20:35:59 +02:00
Jacob Vosmaer 6be0188b5c Rebuild indexes after a MySQL conversion 2014-05-19 17:51:58 +02:00
Jacob Vosmaer dca537ab29 Use the gitlabhq fork of the MySQL converter 2014-05-19 17:49:29 +02:00
Dmitriy Zaporozhets f08cb26487 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-19 15:48:52 +03:00
Dmitriy Zaporozhets eb06509a37 Merge branch 'ubuntu-14-needs-recent-ruby-patch' into 'master'
Ubuntu 14 needs recent ruby patch
2014-05-19 12:48:34 +00:00
dosire 126eefc5b8 Ruby version updated so it doesn't have the readline bug https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-0-0-p481-is-released/. 2014-05-19 14:45:55 +02:00
Sytse Sijbrandij 0484f72c34 Merge pull request #6998 from pkallberg/master
Added Cloud 66 to third party one-click installers
2014-05-19 14:05:39 +02:00
Philip Källberg 50313b646d Removed exclamation mark for Cloud 66 installer 2014-05-19 12:55:56 +01:00
Philip Källberg 0202c98772 Added Cloud 66 to third party one-click installers 2014-05-19 12:45:52 +01:00
Dmitriy Zaporozhets 3a279bb2a9 Merge branch '6.9.0.rc1' into 'master'
Version 6.9.0.rc1
2014-05-19 10:37:47 +00:00
Dmitriy Zaporozhets 85c5a20352 Small UI change to milestone page so it looks similar to issue/mr
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-19 13:34:26 +03:00
Marin Jankovski aacd43d72d 6.9.0 RC1 v6.9.0.rc1 2014-05-19 12:31:20 +02:00
Marin Jankovski 39d95b1d94 Update installation guide, create update guide. 2014-05-19 12:30:30 +02:00
Dmitriy Zaporozhets a85aa4e09e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-19 12:38:31 +03:00
Dmitriy Zaporozhets 1a068d7411 Merge branch 'logrotate_update_fix' into 'master'
Clean up *.log.1 files during 6.6-to-6.7 upgrade
2014-05-19 06:16:15 +00:00
Dmitriy Zaporozhets 386d998e79 Merge branch 'use_example_email' into 'master'
Use example email in documents and example files

Fixes #1177
2014-05-18 18:24:07 +00:00
Dmitriy Zaporozhets 764a269a1e Merge branch 'add-link-to-ee-jenkins' into 'master'
Add link to ee jenkins

/cc @marin
2014-05-18 18:23:32 +00:00
Dmitriy Zaporozhets ccbb2da71a Merge pull request #6990 from Scooletz/master
.NET client introduced to docs
2014-05-18 20:37:59 +03:00