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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	Add gitlab:reply_by_email:check rake task.	Douwe Maan	2015-08-20	2	-3/+151
\| \| \|
\| * \|	Merge branch 'master' into reply-by-email	Douwe Maan	2015-08-20	19	-756/+122
\| \|\ \
\| * \| \|	Test Gitlab::Email::Receiver.	Douwe Maan	2015-08-20	1	-9/+9
\| \| \| \|
\| * \| \|	Make error class names more consistent.	Douwe Maan	2015-08-20	1	-5/+5
\| \| \| \|
\| * \| \|	Fix a couple of whoopsy daisies.	Douwe Maan	2015-08-20	2	-2/+4
\| \| \| \|
\| * \| \|	Extract ReplyParser and AttachmentUploader from Receiver.	Douwe Maan	2015-08-20	6	-325/+362
\| \| \| \|
\| * \| \|	Start on tests.	Douwe Maan	2015-08-19	1	-19/+18
\| \| \| \|
\| * \| \|	Fix init.d script.	Douwe Maan	2015-08-19	1	-15/+15
\| \| \| \|
\| * \| \|	Fix lib/support/init.d/gitlab.	Douwe Maan	2015-08-19	1	-20/+22
\| \| \| \|
\| * \| \|	Update init scripts.	Douwe Maan	2015-08-19	2	-20/+84
\| \| \| \|
\| * \| \|	Send a rejection email when the incoming email couldn't be processed.	Douwe Maan	2015-08-19	1	-6/+10
\| \| \| \|
\| * \| \|	Turn reply-by-email attachments into uploads.	Douwe Maan	2015-08-19	1	-0/+33
\| \| \| \|
\| * \| \|	Changes and stuff.	Douwe Maan	2015-08-18	3	-19/+305
\| \| \| \|
\| * \| \|	Reply by email POC	Douwe Maan	2015-08-18	1	-0/+50
\| \| \| \|
* \| \| \|	Merge branch 'rs-dev-issue-2550' into 'master'	Douwe Maan	2015-08-21	1	-1/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing HTML entities from non-Rinku autolinks as well. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550 See merge request !1179
\| * \| \|	Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550	Robert Speicher	2015-08-20	1	-1/+7
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'fix-backup-restore' into 'master'	Robert Speicher	2015-08-21	1	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not delete the SQL dump too early The change in baa157926d432f404a41c31ad6514ff8d5366269 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 . See merge request !1182
\| * \| \|	Do not delete the SQL dump too early	Jacob Vosmaer	2015-08-21	1	-2/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The change in baa157926d432f404a41c31ad6514ff8d5366269 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
* \| \|	Merge pull request #9535 from bbodenmiller/patch-3	Jacob Vosmaer	2015-08-21	1	-0/+52
\|\ \ \ \| \|/ / \|/\| \|	check upload dir permissions
\| * \|	check uploads dir	Ben Bodenmiller	2015-08-16	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect issues with uploads dir, e.g. permission and ownership issues with the users uploads dir. This helps troubleshoot and correct gitlab-org/omnibus-gitlab#311. Fixes gitlabhq#7500, gitlabhq#7052. Related to gitlabhq#6281.
* \| \|	Import sources: settings in the admin interface	Artem Sidorenko	2015-08-20	2	-1/+31
\| \| \|
* \| \|	Merge branch 'remove-satellites'	Dmitriy Zaporozhets	2015-08-19	16	-755/+90
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \ \	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-17	4	-4/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Refactor pre/post receive commit services into one class	Dmitriy Zaporozhets	2015-08-14	1	-0/+59
\| \| \| \| \|
\| * \| \| \|	Revert "Merge branch 'revert-satellites' into 'master' "	Dmitriy Zaporozhets	2015-08-11	15	-754/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* \| \| \| \|	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 'fix-authhash-infinite-loop' into 'master'	Robert Speicher	2015-08-18	1	-16/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-16/+30
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	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 'mr-source-branch-clear-cache' into 'master'	Dmitriy Zaporozhets	2015-08-18	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2272
* \| \| \| \| \|	Merge branch 'rs-remove-gfm_with_options' into 'master'	Douwe Maan	2015-08-17	2	-12/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-12/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was redundant because `gfm` also took options.
* \| \| \| \| \|	Merge branch 'fix-backslashes-inline-diff' into 'master'	Douwe Maan	2015-08-17	1	-2/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+5
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2253
* \| \| \| \|	Require Ruby 2.1.0 in `gitlab:app:check` task	Robert Speicher	2015-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'mysql_insecure_password_warnings' into 'master'	Stan Hu	2015-08-14	1	-2/+5
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workaround the insecure password warnings emitted by MySQL 5.6 When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1. ``` Warning: Using a password on the command line interface can be insecure. ``` This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable. See merge request !1139
\| * \| \| \|	Workaround the warnings emitted by MySQL 5.6 regarding password on the	Ted Strzalkowski	2015-08-12	1	-2/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	command line.
* \| \| \|	Merge branch 'note-query-information' into 'master'	Stan Hu	2015-08-12	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note query information See merge request !1149
\| * \| \| \|	api: add 'system', 'upvote', and 'downvote' fields to note queries	Ben Boeckel	2015-08-12	1	-0/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9.
* \| \| \|	markup_helper: detect .mkd and .mkdn as markdown	Ben Boeckel	2015-08-12	1	-1/+1
\|/ / /
* \| \|	Merge branch 'revert-satellites' into 'master'	Dmitriy Zaporozhets	2015-08-11	15	-31/+754
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
\| * \| \|	Revert "Fix editing files via API"	Dmitriy Zaporozhets	2015-08-11	1	-26/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7bde6ae540bab5c93a83bfe26102674adba0eab5.
\| * \| \|	Revert "Merge branch 'web-editor-rugged' into 'master'"	Dmitriy Zaporozhets	2015-08-11	4	-0/+210
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	10	-5/+520
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'fix-diff-highlighting' into 'master'	Douwe Maan	2015-08-10	1	-20/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff syntax highlighting ### What does this MR do? This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following: ``` +aaa +bbb ccc ``` However, a regression in 0abe98f0 caused the last line to be put on the second to last line: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png) Instead of this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/59eca6efd4c290aa633b9fb54c98a70e/image.png) This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing. ### What are the relevant issue numbers? Closes #2235 See merge request !1126
\| * \| \| \|	Fix diff syntax highlighting	Stan Hu	2015-08-10	1	-20/+21
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
* \| \| \|	Merge branch 'disable-autocrlf-for-binary-files' into 'master'	Stan Hu	2015-08-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123