home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,044 Commits 48 Branches 340 Tags
73c0dfd265e7d0fd0f8df16fa63eecd6ecf202b4
Commit Graph
1838 Commits
Author SHA1 Message Date
Valery Sizov 73c0dfd265 Kerberos: username as identifier 2014-12-15 18:07:03 +02:00
Valery Sizov cbabc0b2f3 Kerberos: update docs 2014-12-15 18:07:03 +02:00
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' 
CE changes from upstream

See merge request !266
 2014-12-12 12:25:36 +00:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Job van der Voort 030a71b780 use new syntax in ldap doc 2014-12-11 15:15:33 +01:00
Dmitriy Zaporozhets 0f07c18a9f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-12-11 13:26:11 +02:00
Jacob Vosmaer 82eb0a44d7 Add security tips about file and paths 2014-12-09 14:51:15 +01:00
Scott Stamp 8b6a2829ce Example callback URL was incorrect 
(referencing /users/auth/github/callback,
 not /users/auth/twitter/callback)
 2014-12-08 23:04:34 +00:00
Dmitriy Zaporozhets 15d5b287e2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-08 16:03:36 +02:00
Sytse Sijbrandij bfe99a1eee Consolidate unicorn worker advise. 2014-12-08 14:41:45 +01:00
Job van der Voort f811b695f8 memory constrained unicorn workers 2014-12-08 14:21:17 +01:00
Job van der Voort b7d4184f24 advise about unicorn workers 2014-12-08 13:51:27 +01:00
Dmitriy Zaporozhets 230900b981 Merge branch 'upstream-ce' into 'master' 
Upstream changes from CE

See merge request !262
 2014-12-08 12:41:38 +00:00
Robert Schilling 369375d086 Move sidekiq debug docs to development folder 2014-12-07 01:24:03 +01:00
Jacob Vosmaer 8f0b558aaa Add snapshot backup tips 2014-12-05 15:29:45 +01:00
Job van der Voort d092d271e4 Merge branch 'package-update' into 'master' 
Tips for updating CE to EE with RPMs

I got an annoying error today while trying to upgrade CE to EE on Centos.

See merge request !259
 2014-12-05 14:03:25 +00:00
Dmitriy Zaporozhets 1521867219 Merge branch 'release_docs_improvements' into 'master' 
Release docs improvements

Fixes #1734

See merge request !1305
 2014-12-05 13:32:07 +00:00
Marin Jankovski 5f47ca0240 Update packages for 7.5.3. 2014-12-05 13:18:31 +01:00
Marin Jankovski 69e8b0e9fd Merge branch '512mb-memory-description' into 'master' 
512mb memory description

See merge request !1297
 2014-12-05 11:37:37 +00:00
Marin Jankovski 90a308ea00 Update release docs to deploy to GitLab.com before publishing. 2014-12-05 12:34:18 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Dmitriy Zaporozhets e6c5a8b161 Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' 
Rake task for google email schema verfication

#1607

See merge request !1300
 2014-12-05 10:19:10 +00:00
Sytse Sijbrandij 3dc25ba331 Remove warning from db seed since it is called by db setup. 2014-12-04 21:22:21 +01:00
Sytse Sijbrandij 704b7237e6 Fix notifications for developers that don't read the documentation. 2014-12-04 16:54:08 +01:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Jacob Vosmaer dbba454cfb Tips for updating CE to EE with RPMs 2014-12-04 15:09:29 +01:00
Sytse Sijbrandij 372cb87f05 Reword the 512 memmory advise. 2014-12-04 09:47:27 +01:00
Jacob Vosmaer 1aca371880 Add changes suggested by Sytse 2014-12-03 16:50:03 +01:00
Jacob Vosmaer cdabe73025 Fix EE RC1 tag name 2014-12-03 16:30:57 +01:00
Jacob Vosmaer a8ce1d88b5 Release CI at the same time as CE and EE 2014-12-03 15:40:12 +01:00
Job van der Voort 8ab5343764 add the gl 7.5.2-ee packages 2014-12-03 15:22:46 +01:00
Jacob Vosmaer 4ce27042f9 The second gitlab.com deploy should be easy 2014-12-03 14:41:39 +01:00
Jacob Vosmaer 106de470c9 Use clickable checkboxes in issue template 2014-12-03 14:21:00 +01:00
Dmitriy Zaporozhets 6eb944e52b Merge branch 'rebase_on_merge_request' into 'master' 
Rebase on merge request

Introduces merge request option to rebase before merging.

Issue #185

See merge request !254
 2014-12-03 10:15:41 +00:00
Marin Jankovski 79912d6870 System with 512MB of RAM can be used but swap size must be increased. 2014-12-02 14:46:16 +01:00
Marin Jankovski bff0034584 Revert "Remove the lowest memory requirement of 512MB." 
This reverts commit 5cf6d5949d.
 2014-12-02 14:39:58 +01:00
Dmitriy Zaporozhets 6532043697 Merge branch 'disable_arguments_logger' into 'master' 
Disable Sidekiq arguments logging by default

Some of the arguments passed to Sidekiq jobs are secret. With this
change we avoid logging those secrets, by turning off 'argument
logging' altogether.

See merge request !1282
 2014-12-02 10:47:40 +00:00
Job van der Voort e713922bb7 improve ldap sync documentation 2014-12-02 10:16:03 +01:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00
Marin Jankovski 7bf50c8e1d Merge pull request #8376 from bbodenmiller/7-6-upgrade-guide 
add preliminary 7.6 upgrade guide
 2014-12-01 16:55:18 +01:00
Job van der Voort 8e4a7eb444 add documentation on LDAP synchronization in gitlab ee 2014-12-01 16:25:28 +01:00
Sytse Sijbrandij 30e28a7e0c Merge branch 'security-release' into 'master' 
Improve security release documentation

I think the MailChimp step is not needed anymore because we automated it.

See merge request !1271
 2014-12-01 09:52:10 +00:00
Marin Jankovski 9714608ef6 Add rebase merge request documentation, add to changelog. 2014-12-01 09:40:56 +01:00
Achilleas Pipinellis 824ad40699 Make clear that the upgrader script does not update gitlab-shell. 2014-11-29 12:01:32 +02:00
Jacob Vosmaer 426e982f51 Add daily sync explanation from release blog post 2014-11-27 17:05:52 +01:00
Jacob Vosmaer 4bfa5e549d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-27 16:57:49 +01:00
Marc Radulescu c85d4af889 remove unnecessarry image 2014-11-27 10:24:19 +01:00
Ben Bodenmiller 226819c8d1 add details on protected branches 
Add some details from https://about.gitlab.com/2014/11/26/keeping-your-code-protected/:

Who can:
* Force push to non-protected branches
* Force push to protected branches 
* Remove protected branches
 2014-11-26 12:19:19 -08:00
Marc Radulescu 8ccaee1979 replaced hotlink 2014-11-26 20:54:42 +01:00
Marc Radulescu b82a205b74 added office analogy to help understanding of gitlab architecture 2014-11-26 18:51:12 +01:00