16214 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	5b8712e4c2	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-08 12:26:58 +03:00
Dmitriy Zaporozhets	dc76d102b4	Merge pull request #9254 from gitlabhq/revert-8800-email-settings ... Revert "Allow to configure smtp and sendmail in gitlab.yml"	2015-05-08 12:16:40 +03:00
Job van der Voort	0384d2929f	Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master' ... Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com. See merge request !1812	2015-05-08 09:01:10 +00:00
Marin Jankovski	0fc6f0b5d4	Merge branch 'new-issue-after-release' into 'master' ... new issue after release See merge request !1810	2015-05-08 07:10:54 +00:00
Marin Jankovski	8b25ff6634	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-08 09:09:05 +02:00
Marin Jankovski	5dc84fa5ca	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-08 09:08:56 +02:00
Robert Speicher	c4aa700398	Merge branch 'rs-fix-filter-tooltips' into 'master' ... Fix tooltips for event filter links See merge request !618	2015-05-07 21:51:51 +00:00
Douwe Maan	f5f097b765	Merge branch 'feature/handle-big-diffs' into 'master' ... Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. See merge request !539	2015-05-07 19:29:55 +00:00
Jeroen van Baarsen	3a637d73d5	Merge pull request #9239 from Soullivaneuh/git-clone-holder ... Fix bootlint issues on git clone holder bar	2015-05-07 19:08:55 +02:00
Jacob Vosmaer	1c1f18b416	Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var ... It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.	2015-05-07 18:47:03 +02:00
Sullivan SENECHAL	f972a9e34c	Fix bootlint issues on git clone holder bar	2015-05-07 18:32:10 +02:00
Job van der Voort	4164f6155a	new issue after release	2015-05-07 14:26:21 +00:00
Job van der Voort	0ccc4f19d0	Merge branch 'add_yanking_pkg_example' into 'master' ... Add yanking pkg example to the release documentation. See merge request !1809	2015-05-07 14:18:45 +00:00
Marin Jankovski	e7dc9ca2d0	Add yanking pkg example to the release documentation.	2015-05-07 16:15:58 +02:00
Job van der Voort	415648e255	revert to 7.10.1	2015-05-07 13:39:10 +00:00
Sytse Sijbrandij	93a2cc095b	Fix spelling error, thanks Mark	2015-05-07 12:41:05 +00:00
Job van der Voort	895bc33fef	Update upgrader doc to point to 7.10.2	2015-05-07 12:24:18 +00:00
Sytse Sijbrandij	cceb2dd206	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-07 14:22:39 +02:00
Sytse Sijbrandij	deddad6025	Document sidekiq restarting functionality.	2015-05-07 14:22:14 +02:00
Sytse Sijbrandij	93e2c72299	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2015-05-07 14:12:12 +02:00
Douwe Maan	7a23be3ab7	Merge branch 'fix-default-branch' into 'master' ... Make the first branch pushed to an empty repository the default HEAD In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883 See merge request !614	2015-05-07 10:28:50 +00:00
Sytse Sijbrandij	60887cf949	Remove the volumes from the single image to keep it simple.	2015-05-07 10:47:24 +02:00
Job van der Voort	f34f5f362a	Merge branch 'revert-bad-mr' into 'master' ... revert bad link in documentation See merge request !1808	2015-05-07 08:42:40 +00:00
Job van der Voort	5b534a287a	revert bad link in documentation	2015-05-07 10:42:17 +02:00
Job van der Voort	007d4af19c	Merge branch 'Added_link_reset_root_password' into 'master' ... Added link reset root password Added text to link "How to reset root password" cc/ @sytse See merge request !1799	2015-05-07 08:36:47 +00:00
Sytse Sijbrandij	b18dfc8d40	No need to commit when using a dockerfile.	2015-05-07 10:24:55 +02:00
Sytse Sijbrandij	cb4e16b7a3	Ignore mounted Docker directories.	2015-05-07 10:24:38 +02:00
Sytse Sijbrandij	66f7cdeb0a	Cleanup the order of the docker manual a bit more.	2015-05-07 09:38:54 +02:00
Sytse Sijbrandij	9edabac522	Put the retrieval of published images first.	2015-05-07 09:33:13 +02:00
Sytse Sijbrandij	661142ca4a	Add headers and reduce duplication.	2015-05-07 09:21:32 +02:00
Sytse Sijbrandij	3f8d487e3d	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-07 09:10:50 +02:00
Sytse Sijbrandij	2576971f39	Forgot to link the third directory, thanks Ben.	2015-05-07 09:10:35 +02:00
Robert Speicher	9d34efb5cf	Merge branch 'rs-issue-1348' into 'master' ... Add Markdown feature specs for markup inside links It was already working, just want to make sure we don't break it in the future. See merge request !619	2015-05-07 01:10:55 +00:00
Robert Speicher	cb079c8208	Fix Markdown feature spec	2015-05-06 20:43:12 -04:00
Robert Speicher	fdff815a4c	Add Markdown feature specs for markup inside links ... It was already working, just want to make sure we don't break it in the future.	2015-05-06 17:21:19 -04:00
Robert Speicher	5ed7a39dc7	Fix tooltips for event filter links	2015-05-06 12:25:23 -04:00
Dmitriy Zaporozhets	5b3c823fc9	Make header title bold and line between header lighter ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 18:27:44 +03:00
Dmitriy Zaporozhets	f78dfa6da7	Merge branch 'refactor-mr-form' into 'master' ... Refactor mr form * re-use issuable form for new mr page * small UI improvements to MR compare and new pages See merge request !616	2015-05-06 14:50:33 +00:00
Dmitriy Zaporozhets	ea6667b06c	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-06 17:49:05 +03:00
Sytse Sijbrandij	dd37aa06ca	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-06 16:48:05 +02:00
Dmitriy Zaporozhets	065637a80e	Merge branch 'ui-improvements' into 'master' ... Small UI improvements to make project sidebar more neat * make sidebar blocks more compact * make clone panel smaller for better aspect ratio * make `forked from` section cleaner Screenshot:  cc @rspeicher See merge request !617	2015-05-06 14:47:42 +00:00
Sytse Sijbrandij	48f22a39e7	Merge branch 'single-docker-image' into 'master' ... Single docker image See merge request !1805	2015-05-06 14:40:02 +00:00
Sytse Sijbrandij	6518c728ac	Small improvements to the dockerfile.	2015-05-06 16:39:30 +02:00
Dmitriy Zaporozhets	317ed1fa90	Revert "Allow to configure smtp and sendmail in gitlab.yml"	2015-05-06 17:39:18 +03:00
Dmitriy Zaporozhets	c66e575179	Fix tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 17:00:19 +03:00
Dmitriy Zaporozhets	fb00ed9983	Make README link on project home look nicer ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 16:52:04 +03:00
Dmitriy Zaporozhets	342078a76d	Small UI improvements to make project sidebar more neat ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 16:38:45 +03:00
Sytse Sijbrandij	e8edd20bfd	Made a single docker file.	2015-05-06 15:32:29 +02:00
Dmitriy Zaporozhets	d49b993929	Small UI improvements to MR form ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 16:19:09 +03:00
Dmitriy Zaporozhets	cd108a828b	Re-use issuable_form for new merge request ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-06 16:11:47 +03:00