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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Version 7.14.0.rc1v7.14.0.rc1	Robert Speicher	2015-08-18	1	-1/+1
\|
*	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"
\| * \| \| \| \| \|	Revert "Fix for #9527"	Dmitriy Zaporozhets	2015-08-17	1	-12/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'installation-update-guides' into 'master'	Dmitriy Zaporozhets	2015-08-17	3	-14/+143
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Installation and update guides for 7.14 cc @rspeicher See merge request !1168
\| * \| \| \| \|	Create update guides for 7.14installation-update-guides	Dmitriy Zaporozhets	2015-08-17	2	-12/+141
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Update installation guide with 7.14	Dmitriy Zaporozhets	2015-08-17	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'rs-check-ruby-version' into 'master'	Robert Speicher	2015-08-16	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require Ruby 2.1.0 in `gitlab:app:check` task See merge request !1165
\| * \| \| \| \|	Require Ruby 2.1.0 in `gitlab:app:check` task	Robert Speicher	2015-08-15	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'changelog-1124' into 'master'	Robert Schilling	2015-08-15	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update changelog for MR !1124 @dzaporozhets See merge request !1164
\| * \| \| \| \|	Update changelog for MR !1124	Sven Strickroth	2015-08-15	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sven Strickroth <email@cs-ware.de>
* \| \| \| \|	Merge branch 'rs-gem-security' into 'master'	Robert Speicher	2015-08-15	2	-7/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump omniauth-saml to 1.4.1 Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247 See merge request !1162
\| * \| \| \| \|	Bump omniauth-saml to 1.4.1rs-gem-security	Robert Speicher	2015-08-14	2	-7/+7
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247
* \| \| \| \|	Merge branch 'fix/redirect_after_sign_in' into 'master'	Stan Hu	2015-08-14	2	-18/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control. See merge request !1146
\| * \| \| \| \|	Fix redirection after sign in when using auto_sign_in_with_provider	Alex Lossent	2015-08-12	2	-18/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logic for redirect path moved to a filter.
* \| \| \| \| \|	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 pull request #9528 from revaret/Fixed_alignment_issue	Stan Hu	2015-08-14	1	-1/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for #9527
\| * \| \| \| \| \| \|	Fixed #9527	ranjith	2015-08-13	1	-1/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-08-14	3	-1/+39
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'	Dmitriy Zaporozhets	2015-08-14	3	-1/+39
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993
\| \| * \| \| \| \| \| \| \|	Disable internal issue tracker if external tracker in use	Stan Hu	2015-07-17	3	-1/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2006
* \| \| \| \| \| \| \| \| \|	Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update	Stan Hu	2015-08-14	5	-9/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Update Flowdock integration to support new Flowdock API
\| * \| \| \| \| \| \| \| \|	Update Flowdock integration to support new Flowdock API	Boyan Tabakov	2015-08-14	5	-9/+18
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
* \| \| \| \| \| \| \| \|	Merge branch 'improve-readability' into 'master'	Dmitriy Zaporozhets	2015-08-14	4	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set max-width for README, issue and merge request description It allows easier text reading on big screens ### Problem Text is hard to read on wide screens: ![Screenshot_2015-08-14_11.33.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bdb092c09495c7aa94b0589df4b7e65/Screenshot_2015-08-14_11.33.39.png) ### Solution Set max-width to content. Screenshots: ![Screenshot_2015-08-14_11.31.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/00cd7a77b81b30458a1675ec562d7463/Screenshot_2015-08-14_11.31.54.png) ![Screenshot_2015-08-14_10.53.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4756f87a3bbb7179e55b1c8f8ee40459/Screenshot_2015-08-14_10.53.16.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1161
\| * \| \| \| \| \| \| \| \|	Add CHANGELOG item	Dmitriy Zaporozhets	2015-08-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Set max-width for README, issue and merge request description	Dmitriy Zaporozhets	2015-08-14	3	-0/+10
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It allows easier text reading on big screens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-14	2	-0/+2
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'respect_filters' into 'master'	Dmitriy Zaporozhets	2015-08-14	2	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: User search feature in admin area does not respect filters https://dev.gitlab.org/gitlab/gitlabhq/issues/2482 See merge request !1155
\| \| * \| \| \| \| \| \| \|	Fix: User search feature in admin area does not respect filtersrespect_filters	Valery Sizov	2015-08-13	2	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-14	17	-32/+110
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /