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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| *	Fix corrupted binary files when using API files endpoint	Stan Hu	2015-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
* \|	Merge branch 'rs-reference-data-attrs' into 'master'	Robert Speicher	2015-08-10	8	-8/+32
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
\| *	Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs	Robert Speicher	2015-08-08	8	-8/+32
\| \| \| \| \| \| \| \|	This is to let us redact them later in another filter.
* \|	Merge branch 'bitbucket-show-incompatible' into 'master'	Douwe Maan	2015-08-07	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show incompatible projects in Bitbucket import status ### What does this MR do? This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table. ### Why was this MR needed? Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa). ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png) ### What are the relevant issue numbers? #1871 See merge request !1114
\| * \|	Show incompatible projects in Bitbucket import status	Stan Hu	2015-08-07	1	-0/+4
\| \|/ \| \| \| \| \| \|	See #1871
* \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-08-06	15	-533/+141
\|\ \ \| \|/
\| *	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'	Douwe Maan	2015-08-06	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
\| \| *	Fix "Network" and "Graphs" pages for branches with encoded slashes	Stan Hu	2015-08-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #1359
\| * \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	10	-520/+5
\| \|\ \
\| \| * \	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	24	-118/+484
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Fix merge api and spec	Dmitriy Zaporozhets	2015-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Huge refactoring for accepting merge requests	Dmitriy Zaporozhets	2015-07-16	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Fix application initialize	Dmitriy Zaporozhets	2015-07-15	1	-0/+4
\| \| \| \| \|
\| \| * \| \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	9	-523/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'rs-fix-rouge-inline-theme' into 'master'	Stan Hu	2015-08-04	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the `inline_theme` option for the Rouge formatter See merge request !1083
\| \| * \| \|	Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-theme	Robert Speicher	2015-08-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-03	10	-22/+173
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge branch 'api-useremails' into 'master'	Robert Speicher	2015-07-31	2	-6/+121
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066
\| \| \| * \|	Fix indentation	Douwe Maan	2015-07-31	1	-11/+11
\| \| \| \| \|
\| \| \| * \|	Merge branch 'master' into api-useremails	Douwe Maan	2015-07-31	8	-14/+42
\| \| \| \|\ \
\| \| \| * \| \|	Add ability to manage user email addresses via the API.	Douwe Maan	2015-07-29	2	-0/+115
\| \| \| \| \| \|
\| \| * \| \| \|	Fix multi-line syntax highlighting	Stan Hu	2015-07-30	1	-2/+10
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
\| * \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵	Jacob Vosmaer	2015-07-29	13	-95/+300
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \|	backup-archive-permissions
\| * \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵	Jacob Vosmaer	2015-07-27	13	-30/+103
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backup-archive-permissions
\| * \| \| \| \|	Allow custom backup archive permissions	Jacob Vosmaer	2015-07-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change helps system administrators who want to replicate GitLab backup files without needing root permissions.
* \| \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-07-31	8	-14/+42
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-mr-1050-followup' into 'master'	Robert Speicher	2015-07-31	1	-2/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078
\| \| * \| \| \| \|	Add spec to RelativeLinkFilter for Unicode filenames	Robert Speicher	2015-07-30	1	-2/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'api-new-attributes' into 'master'	Robert Speicher	2015-07-30	1	-0/+10
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
\| \| * \| \| \| \|	No more web url	Douwe Maan	2015-07-30	1	-2/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into api-new-attributes	Douwe Maan	2015-07-29	7	-12/+257
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Add project star and fork count, group avatar URL and user/group web URL ↵	Douwe Maan	2015-07-28	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attributes to API
\| * \| \| \| \| \|	Merge branch 'fix-image-file-is-not-displayed' into 'master'	Robert Speicher	2015-07-30	1	-2/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050