Commit Graph
947 Commits
Author SHA1 Message Date
Jacob Vosmaer c924bac949 Add packages for 6.7.4-ee 2014-04-14 15:19:07 +02:00
Dmitriy Zaporozhets 9436c506d4 Merge branch 'upstream-ce-6-8' into 'master'
Upstream CE 6.8
2014-04-11 06:11:01 +00:00
Job van der Voort 875556fd63 make archive easier to navigate 2014-04-10 16:27:03 +02:00
Job van der Voort a83b40b381 add 6.7.3-ee packages 2014-04-10 15:32:16 +02: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
dosire 670e02982c Steer people to the packages since people encounter less errors installing those. 2014-04-10 09:20:19 +02:00
dosire 12c49dd989 People forget to compile their assets, start after doing that. 2014-04-09 07:58:57 +02:00
dosire b2b790afa7 Nicer formulation. 2014-04-08 17:18:17 +02:00
Jacob Vosmaer 2db296f8ab Update omnibus openssl for CVE-2014-0160 2014-04-08 17:17:29 +02:00
dosire 9924492adf Document the need for dev packages since Multiple people asked about it. 2014-04-08 16:10:10 +02:00
dosire 2a9eb02650 Also need to change the reference. 2014-04-08 12:38:24 +02:00
dosire 76ca5976de Remove nested images since they are not supported by https://gitlab.com/gitlab-com/doc-gitlab-com 2014-04-08 12:28:59 +02:00
Dmitriy Zaporozhets 3b339a8b04 More info about GitLab integrations with OAuth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-08 10:32:00 +03:00
Marin Jankovski b700ba0e33 Group by OS. 2014-04-07 17:02:14 +02:00
Marin Jankovski 807f067336 Add packages for 6.7.2-ee. 2014-04-07 16:53:39 +02:00
Dmitriy Zaporozhets 26c5102002 Fix link in integration doc 2014-04-07 14:39:45 +00:00
dosire 5b018cc5b1 Name should be oauth and not twitter. 2014-04-07 14:52:35 +02:00
Dmitriy Zaporozhets e7f8080666 Merge branch 'wording-of-link-text' into 'master'
Wording of link text
2014-04-07 12:18:04 +00:00
dosire db880cf39f Image for GitHub app setup. 2014-04-07 14:17:40 +02:00
Dmitriy Zaporozhets c06255e150 fix image link 2014-04-07 12:17:32 +00:00
dosire a4523c5292 Also add example for GitHub. 2014-04-07 14:11:00 +02:00
Dmitriy Zaporozhets d8ed899038 Merge branch 'add-twitter' into 'master'
Add twitter documentation
2014-04-07 10:40:15 +00:00
dosire ba72bd1dee Add twitter documentation. 2014-04-07 11:53:48 +02:00
Sytse Sijbrandij 26ab17a800 Merge pull request #5508 from jojosch/apidoc-json
Api-Doc and Web-Hooks JSON lint
2014-04-06 13:19:52 +02:00
Dmitriy Zaporozhets 7ae488ede3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-05 13:20:01 +03:00
Johannes Schleifenbaum 49addad7b5 Api-Doc JSON lint
Fixes: #5505
2014-04-05 08:37:42 +02:00
Sytse Sijbrandij 7611ce72b9 Merge branch 'doc/ldap' into 'master'
Explain LDAP activation for existing users
2014-04-04 14:47:14 +00:00
Jacob Vosmaer bb9ec71127 Explain how existing users can enable LDAP 2014-04-04 16:22:11 +02:00
Dmitriy Zaporozhets 1f1cfc9eba Merge pull request #5950 from axilleas/bundler_parallel
Refer to bundler's ability of parallel installation
2014-04-04 14:37:07 +03:00
Dmitriy Zaporozhets ad3a3e5201 Merge pull request #6658 from tsigo/rs-important-dirs
Make sure important directories exist in git
2014-04-04 14:31:26 +03:00
Marin Jankovski a3af64b418 Merge branch 'add-one-line-upgrader-command' into 'master'
Add One Line Upgrader Command

This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.
2014-04-04 08:32:08 +00:00
Remy van Elst 68436e964f Add one line upgrade command. 2014-04-04 10:19:40 +02:00
Marin Jankovski 04324908fb Add to update guides satellites group permission. 2014-04-04 09:36:25 +02:00
Dmitriy Zaporozhets 6594ce1de0 Merge branch 'specific-warning-for-version-managers' into 'master'
Specific-warning-for-version-managers
2014-04-03 11:28:31 +00:00
dosire 770747af68 Specify that the tag should be annotated. 2014-04-03 10:09:52 +02:00
dosire b8ea26f7a6 Merge branch 'master' into readable-doc-readme
Conflicts:
	doc/README.md
2014-04-02 17:45:10 +02:00
Dmitriy Zaporozhets dc8bd60707 Merge branch 'satellites_permission' into 'master'
Update satellites directory permissions
2014-04-02 15:30:26 +00:00
Job van der Voort 3acad539be workflow index; newlines; small description 2014-04-02 16:15:55 +02:00
dosire 80bc7c4ca5 More explicit warning since we still see many people running into problems with this. 2014-04-02 16:10:53 +02:00
Marin Jankovski 03b8dcce87 Change the satellites directory permission in the install guide, add to rake check task. 2014-04-02 15:25:26 +02:00
Job van der Voort c66c84a40d add project features to doc/workflow 2014-04-02 14:45:59 +02:00
dosire d54e3f361a Remove top header. 2014-04-02 12:47:45 +02:00
dosire 7aacc08a92 Make headers of the doc bold. 2014-04-02 12:47:07 +02:00
dosire cc3ea3d373 Adapt the layout of the doc readme to fit the help page. 2014-04-02 12:46:17 +02:00
Job van der Voort 648903504f add 6.7-ce-to-ee guide 2014-04-02 10:38:15 +02:00
Jacob Vosmaer cb8b93f759 Be more specific about omnibus-gitlab features 2014-04-01 17:06:03 +02:00
Marc RadulescuandJacob Vosmaer cf788f3d97 fix JIRA documentation by explaining how to reference JIRA issues in GitLab comments 2014-04-01 17:03:58 +02:00
Jacob Vosmaer da255da8d6 Merge branch 'packages/6-7' into 'master'
Packages for GitLab EE 6.7.1
2014-04-01 11:19:47 +00:00
Jacob Vosmaer 7301417820 Add packages for 6.7.1 EE 2014-04-01 12:53:05 +02:00
Dmitriy Zaporozhets 9be05a430b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-01 12:28:21 +03:00