Commit Graph
9759 Commits
Author SHA1 Message Date
Job van der Voort b5b7a400a3 add manual check of rake tasks 2014-05-09 11:56:44 +02:00
Jacob Vosmaer f4f99a9375 Add the 6.8 CE to EE update guide 2014-05-08 17:14:43 +02:00
Dmitriy Zaporozhets fdfcf01a3d Merge branch 'jira_references' into 'master'
Reference JIRA tickets without hash
2014-05-07 11:57:19 +00:00
Marin Jankovski 32eb647c5c Better name for config variable. 2014-05-07 12:09:05 +02:00
Marin Jankovski 7bc054ec8a Add support for Jira ticket mentions in format JIRA-123. 2014-05-06 19:51:56 +02:00
Jacob Vosmaer 8909f56488 Merge branch 'package_info' into 'master'
Correct package info
2014-04-30 06:35:38 +00:00
Jacob Vosmaer d54800fd9b Fix link text for 6.8.0-ee packages 2014-04-30 08:33:23 +02:00
Jacob Vosmaer c35501caaa Update information about supported features 2014-04-30 08:33:11 +02:00
Job van der Voort 7b20915702 Merge branch '68ee-pkgs' into 'master'
Omnibus packages for 6.8.0-ee
2014-04-28 14:18:55 +00:00
Job van der Voort 24f180445c new packages for 6.8.0-ee 2014-04-28 15:28:53 +02:00
Job van der Voort 5bba821843 Merge branch 'ce-6-8-1' into 'master'
Put 6.8.1 into EE
2014-04-24 11:33:34 +00:00
Dmitriy Zaporozhets 31e804f887 Merge branch '6-8-stable' of dev.gitlab.org:gitlab/gitlabhq into ce-6-8-1
Conflicts:
	VERSION
2014-04-24 08:36:49 +02:00
Dmitriy Zaporozhets c95cca9de7 Merge branch '6-8-ce-to-ee' into 'master'
Upstream 6.8 CE to EE
2014-04-24 06:30:58 +00:00
Jacob Vosmaer 319799073b Bump version to 6.8.1 v6.8.1 2014-04-23 11:23:09 +02:00
Jacob Vosmaer 15ac738c60 Bump the required gitlab-shell version to 1.9.3 2014-04-23 11:21:55 +02:00
Job van der Voort a0c3643f6a Merge branch '6-8-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-8-stable 2014-04-22 15:04:47 +02:00
Job van der Voort 241132b6eb version 6.8.0 v6.8.0 2014-04-22 14:51:38 +02:00
Dmitriy Zaporozhets 6fd13ab041 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-22 14:37:28 +02:00
Dmitriy Zaporozhets 07deb2254b Merge branch 'shell_version_install_doc' into 'master'
Update Shell version in the Install doc
2014-04-22 12:34:02 +00:00
Dmitriy Zaporozhets c66adcea7f Merge branch 'shell_version_install_doc' into '6-8-stable'
Update Shell version in the Install doc
2014-04-22 12:31:58 +00: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
Sytse Sijbrandij 52a247da5e Merge pull request #6783 from pkgr/allow-secret-token-env
Allow to specify secret token via SECRET_KEY_BASE environment variable.
2014-04-22 13:51:34 +02:00
Sytse Sijbrandij 6d4e2776ca Merge branch 'detailed-monthly-release' into 'master'
Detailed monthly release

Fixes #1190
2014-04-22 11:26:39 +00:00
Job van der Voort e79c915d3b remove redudant text in release doc 2014-04-22 12:54:23 +02:00
Marin Jankovski 19438af8d1 Update installation guide with new shell version. 2014-04-22 12:23:57 +02:00
Job van der Voort 223070b3fe add steps to monthly releases 2014-04-22 12:06:54 +02:00
Dmitriy Zaporozhets 55e46ad5f9 Update db schema 2014-04-22 12:00:51 +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
Dmitriy Zaporozhets 1b491c364d Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-22 11:41:29 +02:00
Job van der Voort 3d3e3913b5 Merge pull request #6806 from robertd/fix-typo-in-docs
Fix minor typo in docs
2014-04-22 11:39:10 +02:00
Dmitriy Zaporozhets 814a459527 Merge branch '512mb' into 'master'
512mb

Most people only care about the 512mb option, we should mention that with one worked you don't get http pushes.
2014-04-22 07:06:15 +00:00
Job van der Voort 3e50d615a2 Merge pull request #6808 from robertd/upgrade-docs-6.7-6.8
Update title and revert section of 6.7-to-6.8 docs
2014-04-22 08:25:55 +02:00
robertd e2fd2bf9f5 Update title and revert section of 6.7-to-6.8 docs 2014-04-21 09:43:20 -04:00
dosire 01799721dc Take into account active users. 2014-04-21 12:34:08 +02:00
Sytse Sijbrandij 9b7dd8b4c0 Merge pull request #6821 from skv-headless/fix_type
fix installation.md typo
2014-04-18 15:05:50 +02:00
Evgeniy Sokovikov bc732a89be fix installation.md type
depency -> dependency
2014-04-18 14:35:38 +04:00
Sytse Sijbrandij 2bfd95d850 Merge branch 'workflow_documentation' into 'master'
Workflow documentation
2014-04-18 08:49:18 +00:00
Jacob Vosmaer f0f0ac6321 Remove help document title
Help pages on doc.gitlab.com/ce are missing titles. This needs to be
solved globally.
2014-04-18 10:39:04 +02:00
Jacob Vosmaer eadcd278be Bring back 'Authorization for Merge Requests'
This text was deleted in 564c37d9b6.
2014-04-18 10:10:40 +02:00
Jacob Vosmaer b9e040f8bf Link to the workflow index 2014-04-18 10:03:57 +02:00
Dmitriy Zaporozhets ad61a61304 Merge branch 'update-monthly-release-doc' into 'master'
Update monthly release doc

/cc @sytse @jacobvosmaer @marin
2014-04-17 18:12:28 +00:00
Dmitriy Zaporozhets 43ac196dfb Merge branch 'official-location' into 'master'
Official location

I got two today:
https://twitter.com/wonderb0lt/status/456545094644936705
https://twitter.com/madpew/status/456758525398884352
2014-04-17 18:11:45 +00:00
robertd b3e5b12e9b Fix minor typo in docs 2014-04-17 10:15:05 -06:00
Job van der Voort f81123811e add dependency check to montly release doc and tweet instructions 2014-04-17 16:30:24 +02:00
dosire bd183bfba9 Prevent questions about the canonical source. 2014-04-17 13:45:06 +02:00
Dmitriy Zaporozhets b14c475a4c Merge branch 'rc1-updates' into 'master'
Rc1 updates

#1178

Please check it well 😃

If this gets merged, the annotated version tag 6.8.0.rc1 will point to https://dev.gitlab.org/gitlab/gitlabhq/commit/e6b668ab0169f981a5c4162cd8625daf02e6f5a8

/cc @sytse @jacobvosmaer @marin
2014-04-17 11:02:36 +00:00
Job van der Voort f931195d34 bump versions in update guide 2014-04-17 10:47:35 +02:00
Job van der Voort c2ad30638a add 67-68 update guide 2014-04-17 10:15:50 +02:00
Job van der Voort e6b668ab01 update VERSION to 6.8.0.rc1 v6.8.0.rc1 2014-04-17 09:42:33 +02:00
Job van der Voort 00b576e67d update version in installation doc 2014-04-17 09:42:08 +02:00