delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Case-insensetive search for commentscomment-case-insensetive-search	Dmitriy Zaporozhets	2015-08-19	3	-1/+8
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'security' into 'master'	Job van der Voort	2015-08-19	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added note about backing up recovery codes Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs. This is why I added a section about it at the top, so they read it before enabling them. https://twitter.com/deathgreps/status/632006221814464512 https://twitter.com/benniemosher/status/633768429313372160 See merge request !1923
\| *	added note about backing up recovery codes	karen Carias	2015-08-18	1	-0/+4
\| \|
* \|	Merge branch 'remove-satellites'	Dmitriy Zaporozhets	2015-08-19	84	-1434/+666
\|\ \ \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-17	36	-70/+328
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \ \	Merge branch 'pre-receive-wo-satellites' into 'remove-satellites'	Dmitriy Zaporozhets	2015-08-17	9	-129/+174
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support of pre-receive hooks without satellites Implement commit transaction with pre-receive and post-receive hooks for web editor and merge Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1154
\| \| * \| \|	Fix typo in text when raise pre-receive exception	Dmitriy Zaporozhets	2015-08-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	save repo empty state into variable for proper resultpre-receive-wo-satellites	Dmitriy Zaporozhets	2015-08-17	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Remove unnecessary file	Dmitriy Zaporozhets	2015-08-14	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	merge with support of pre-receive and post-receive hooks	Dmitriy Zaporozhets	2015-08-14	2	-20/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Refactor how repository makes commit with pre/post receive hooks	Dmitriy Zaporozhets	2015-08-14	6	-95/+94
\| \| \| \| \|
\| \| * \| \|	Refactor pre/post receive commit services into one class	Dmitriy Zaporozhets	2015-08-14	5	-154/+76
\| \| \| \| \|
\| \| * \| \|	Make sure target has not changed during pre-receive hook	Dmitriy Zaporozhets	2015-08-14	1	-1/+8
\| \| \| \| \|
\| \| * \| \|	Fix tests for web editor	Dmitriy Zaporozhets	2015-08-14	2	-3/+4
\| \| \| \| \|
\| \| * \| \|	Disable pre-receive check in test env	Dmitriy Zaporozhets	2015-08-14	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Capture pre-receive exception	Dmitriy Zaporozhets	2015-08-13	2	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Implement commit transaction with pre-receive and post-receive hooks for web ↵	Dmitriy Zaporozhets	2015-08-13	9	-13/+122
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-11	12	-40/+59
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Update CHANGELOG	Dmitriy Zaporozhets	2015-08-11	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Revert "Merge branch 'revert-satellites' into 'master' "	Dmitriy Zaporozhets	2015-08-11	100	-1670/+844
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-19	4	-1/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge pull request #9567 from bigsurge/bigsurge-patch-1	Stan Hu	2015-08-19	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add CommitNote field expose :created_at
\| \| * \| \| \|	add CommitNote field expose :created_at	bigsurge	2015-08-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add CommitNote field expose :created_at
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Robert Schilling	2015-08-19	1	-0/+1
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'wip-blog-post' into 'master'	Sytse Sijbrandij	2015-08-18	1	-0/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure blog post MR has WIP keyword cc @sytses @rspeicher See merge request !1172
\| \| \| * \| \| \| \|	Make sure blog post MR has WIP keywordwip-blog-post	Dmitriy Zaporozhets	2015-08-18	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Time for 8.0.0.pre	Robert Schilling	2015-08-19	2	-1/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-help-path-traversal' into 'master'	Douwe Maan	2015-08-18	1	-2/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix path traversal in HelpController Closes #2543 See merge request !1922
\| * \| \| \| \| \|	Use File.join instead of Rails.root.join in HelpController	Robert Speicher	2015-08-18	1	-2/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-authhash-infinite-loop' into 'master'	Robert Speicher	2015-08-18	3	-20/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix infinite loop when SAML was incorrectly configured. See merge request !1170
\| * \| \| \| \| \|	Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loop	Douwe Maan	2015-08-17	3	-20/+31
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-rake-info' into 'master'	Robert Speicher	2015-08-18	1	-2/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab:env:info rake task. Found doing QA. See merge request !1169
\| * \| \| \| \|	Fix gitlab:env:info rake task.fix-rake-info	Douwe Maan	2015-08-17	1	-2/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-08-18	4	-1/+21
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'mr-source-branch-clear-cache' into 'master'	Dmitriy Zaporozhets	2015-08-18	4	-0/+20
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160
\| \| * \| \| \| \|	Clear cache to prevent listing deleted branches after MR removes source branch	Stan Hu	2015-08-14	4	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2272
\| * \| \| \| \| \|	Fix incorrect CHANGELOG version	Stan Hu	2015-08-17	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9564 from bbodenmiller/robots.txt	Stan Hu	2015-08-18	2	-1/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disallow irrelevant pages by defaults in robots
\| * \| \| \| \| \| \|	disallow irrelevant pages by default in robots	Ben Bodenmiller	2015-08-17	2	-1/+63
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update default robots.txt rules to disallow irrelevant pages that search engines should not care about. This will still allow important pages like the files, commit details, merge requests, issues, comments, etc. to be crawled.
* \| \| \| \| \| \|	Merge pull request #9436 from bbodenmiller/patch-4	Stan Hu	2015-08-18	2	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	capitalize URL in "Home page URL"
\| * \| \| \| \| \|	capitalize URL in "Home page URL"	Ben Bodenmiller	2015-08-17	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'bump-gitlab-git' into 'master'	Stan Hu	2015-08-18	3	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules Closes #2262 See merge request !1171
\| * \| \| \| \| \|	Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules	Stan Hu	2015-08-17	3	-3/+4
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2262
* \| \| \| \| \|	Merge branch 'rs-remove-gfm_with_options' into 'master'	Douwe Maan	2015-08-17	3	-14/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the `gfm_with_options` helper It was redundant because `gfm` also took options. See merge request !1152
\| * \| \| \| \| \|	Remove the `gfm_with_options` helperrs-remove-gfm_with_options	Robert Speicher	2015-08-12	3	-14/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was redundant because `gfm` also took options.
* \| \| \| \| \| \|	Merge branch 'fix-backslashes-inline-diff' into 'master'	Douwe Maan	2015-08-17	3	-2/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png) With this fix, it looks like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png) Closes #2253 See merge request !1143
\| * \| \| \| \| \| \|	Fix bug where backslashes in inline diffs could be dropped	Stan Hu	2015-08-11	3	-2/+45
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2253
* \| \| \| \| \| \|	Merge branch 'code-import-error-ui-improvements' into 'master'	Douwe Maan	2015-08-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve error message display when project fails to import Follow-up to !1134. New screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png) See merge request !1138
\| * \| \| \| \| \| \|	Improve error message display when project fails to import	Stan Hu	2015-08-11	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue	Dmitriy Zaporozhets	2015-08-17	1	-12/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Fix for #9527"