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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed markdown buttons in FFff-markdown-buttons-fix	Phil Hughes	2016-07-05	1	-2/+3
\|
*	Merge branch '19496-fix-build' into 'master'	Stan Hu	2016-07-05	1	-2/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assert against `ActionMailer::Base.deliveries` relatively - Closes #19496 - Fixes `master` build See merge request !5082
\| *	Assert against `ActionMailer::Base.deliveries` relatively.	Timothy Andrew	2016-07-05	1	-2/+1
\|/ \| \| \| \| \| \| \|	- Look for a `change` in its size rather than asserting against an actual size. - This previously failed because another spec had an email in `ActionMailer::Base.deliveries`, which failed this `be_nil` assertion.
*	Merge branch 'diagnosing-mail-issues' into 'master'	Achilleas Pipinellis	2016-07-04	1	-2/+51
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add troubleshooting section for SMTP settings See merge request !5046
\| *	Add troubleshooting section for SMTP settings	Stan Hu	2016-07-01	1	-2/+51
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2016-07-04	7	-9/+65
\|\ \
\| * \	Merge branch 'master' into dev-master	Tomasz Maczukin	2016-07-02	396	-3101/+7106
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (98 commits) Enable Style/EmptyLines cop, remove redundant ones Update CHANGELOG Cache results from jQuery selectors to retrieve namespace name Fix import button when import fail due the namespace already been taken Fix snippets comments not displayed Fix emoji paths in relative root configurations Exclude requesters from Project#members, Group#members and User#members Upgrade Thin from 1.6.1 to 1.7.0. Many squashed commits Cache autocomplete results Upgrade Sidekiq from 4.1.2 to 4.1.4. Upgrade seed-fu from 2.3.5 to 2.3.6 use has_many relationship with events Support creating a todo on issuables via API Expose target, filter by state as string Add todos API documentation and changelog Improve the request / withdraw access button Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab Groundwork for Kerberos SPNEGO (EE feature) Update CHANGELOG 8.9.5 for runners related fixes ...
\| * \ \	Merge branch '18033-private-repo-mentions' into 'master'	Douwe Maan	2016-06-30	4	-2/+42
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure logged-out users can't see private refs https://gitlab.com/gitlab-org/gitlab-ce/issues/18033 I'm still not sure what to do about the CHANGELOG on security issues - should I add to a patch release? This issue was assigned to 8.10. See merge request !1974
\| \| * \| \|	Ensure logged-out users can't see private refs	Sean McGivern	2016-06-30	4	-2/+42
\| \| \| \| \|
\| * \| \| \|	Merge branch '19312-confidential-issue' into 'master'	Douwe Maan	2016-06-30	3	-7/+24
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix privilege escalation issue with OAuth external users Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312 This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list. /cc @douwe See merge request !1975
\| \| * \| \|	Fixed privilege escalation issue where manually set external users would be ↵	Patricio Cano	2016-06-29	3	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.
* \| \| \| \|	Merge branch 'user-avatar-header' into 'master'	Dmitriy Zaporozhets	2016-07-04	6	-20/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added user avatar to header ## What does this MR do? Adds the users avatar to the header with a dropdown for profile & sign out. ## What are the relevant issue numbers? Closes #18543 ## Screenshots (if relevant) ![Screen_Shot_2016-06-27_at_12.47.34](/uploads/852d0eb7075eefcf21f5cf5ff71a389a/Screen_Shot_2016-06-27_at_12.47.34.png) ![Screen_Shot_2016-06-27_at_12.47.36](/uploads/6cb29843d3a12bbf2d3ed2a7c9bde770/Screen_Shot_2016-06-27_at_12.47.36.png) See merge request !4939
\| * \| \| \| \|	Updating padding in dropdown menuuser-avatar-header	Phil Hughes	2016-06-29	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed logout tests	Phil Hughes	2016-06-28	4	-6/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Added user avatar to header	Phil Hughes	2016-06-27	3	-11/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18543
* \| \| \| \| \|	Merge branch 'more_descriptive_git_shell_messages' into 'master'	Dmitriy Zaporozhets	2016-07-04	4	-3/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle custom Git hook result in GitLab UI ## What does this MR do? This MR fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19190 It allows to show messages from git custom hooks ## Screenshots (if relevant) ![joxi_screenshot_1467651998090](/uploads/7f814523c96712c07b4f4b52c843aab3/joxi_screenshot_1467651998090.png) See merge request !5073
\| * \| \| \| \| \|	Handle custom Git hook result in GitLab UI	Valery Sizov	2016-07-04	4	-3/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-dead-links' into 'master'	Achilleas Pipinellis	2016-07-04	4	-6/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dead links in the docs (Jun 2016) ## What does this MR do? Fix dead links in the docs found as of Jun 2016. ## Are there points in the code the reviewer needs to double check? n/a ## Why was this MR needed? This MR must improve UX on docs.gitlab.com. ## What are the relevant issue numbers? Closes #19156 ## Does this MR meet the acceptance criteria? - No [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) updated - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4921
\| * \| \| \| \| \| \|	Fix dead links in the docs	Takuya Noguchi	2016-06-26	4	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'upgrade-rspec-rails' into 'master'	Robert Speicher	2016-07-04	2	-21/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade rspec-rails from 3.4.2 to 3.5.0. Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/ See merge request !5051
\| * \| \| \| \| \| \| \|	Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-rails	Connor Shea	2016-07-01	2	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also upgrade its dependencies. Includes Rails 5 support. Changelogs: rspec-rails: https://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0 rspec-core: https://github.com/rspec/rspec-core/compare/v3.4.0...v3.5.0 rspec-support: https://github.com/rspec/rspec-support/compare/v3.4.0...v3.5.0 rspec-expectations: https://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0 rspec-mocks: https://github.com/rspec/rspec-mocks/compare/v3.4.0...v3.5.0 rspec: https://github.com/rspec/rspec/compare/v3.4.0...v3.5.0
* \| \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Hannes Rosenögger	2016-07-04	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md - SSH password can be changed with `ssh-keygen -p` SSH password can be changed with `ssh-keygen -p` See merge request !4152
\| * \| \| \| \| \| \| \| \|	Add note on changing password of SSH key	Caesar Schinas	2016-05-25	1	-3/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update README.md - SSH password can be changed with `ssh-keygen -p`	Caesar Schinas	2016-05-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'save-artifacts_sizes' into 'master'	Rémy Coutable	2016-07-04	6	-21/+69
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Save artifacts sizes ## What does this MR do? Introduce ci_builds.artifacts_size as an integer, so that it's easier to access than reading from the file again. ## What are the relevant issue numbers? Closes #18869 See merge request !4964
\| * \| \| \| \| \| \| \| \|	Use describe rather than context for this:save-artifacts_sizes	Lin Jen-Shin	2016-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964/diffs#note_12867416 Guidelines: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/testing.md#general-guidelines > Use `context` to test branching logic.
\| * \| \| \| \| \| \| \| \|	Explicitly set to nil when artifacts don't exist:	Lin Jen-Shin	2016-07-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12867273
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes	Lin Jen-Shin	2016-07-04	704	-3380/+8041
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (175 commits) Document Repository#keep_around Don't garbage collect commits that have related DB records like comments Update CHANGELOG Update RedCloth to 4.3.2 for CVE-2012-6684 Fix typo in Merge Requests API documentation Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq Enable Style/EmptyLines cop, remove redundant ones Update CHANGELOG Cache results from jQuery selectors to retrieve namespace name Fix import button when import fail due the namespace already been taken Fix snippets comments not displayed Fix emoji paths in relative root configurations Exclude requesters from Project#members, Group#members and User#members Upgrade Thin from 1.6.1 to 1.7.0. Many squashed commits Cache autocomplete results Upgrade Sidekiq from 4.1.2 to 4.1.4. Upgrade seed-fu from 2.3.5 to 2.3.6 use has_many relationship with events Support creating a todo on issuables via API ...
\| * \| \| \| \| \| \| \| \| \|	Add a new column `artifacts_size` to table `ci_builds` !4964	Lin Jen-Shin	2016-07-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use describe rather than context, feedback from:	Lin Jen-Shin	2016-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12861588
\| * \| \| \| \| \| \| \| \| \|	Rename to "successful artifacts upload", feedback:	Lin Jen-Shin	2016-07-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12861577
\| * \| \| \| \| \| \| \| \| \|	Rename shared_examples, feedback:	Lin Jen-Shin	2016-07-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12817406
\| * \| \| \| \| \| \| \| \| \|	Remove migration guide comment:	Lin Jen-Shin	2016-07-01	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They're accessible after doing `rails g migration` anyway. Though I somehow feel this comment could be useful for someone who's new and just browsing the source.
\| * \| \| \| \| \| \| \| \| \|	Use nil for non-existing files rather than 0	Lin Jen-Shin	2016-07-01	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use AR callbacks as suggested by:	Lin Jen-Shin	2016-06-29	3	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12744656
\| * \| \| \| \| \| \| \| \| \|	Also remove ci_builds.artifacts_size when erased	Lin Jen-Shin	2016-06-28	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Prefer Ci::Build#erase_artifacts!	Lin Jen-Shin	2016-06-28	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Just save the size in total rather than individual files	Lin Jen-Shin	2016-06-28	5	-36/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12741046
\| * \| \| \| \| \| \| \| \| \|	Introduce ci_builds.artifacts_sizes as JSON:	Lin Jen-Shin	2016-06-28	4	-3/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We store the sizes as a hash from path to bytes like: ``` ruby {'ci_artifacts.txt' => 27, 'other_artifacts_0.1.2/another-subdirectory/banana_sample.gif' => 71759, 'other_artifacts_0.1.2/doc_sample.txt' => 1314, 'rails_sample.jpg' => 35255, 'tests_encoding/utf8 test dir ✓/regular_file_2' => 7} ``` So that it's easier to access than reading gzip file again.
\| * \| \| \| \| \| \| \| \| \|	Cleanup the tests a bit in order to extend it	Lin Jen-Shin	2016-06-28	1	-15/+34
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-spring-to-1.7.2' into 'master'	Rémy Coutable	2016-07-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update spring to 1.7.2 to fix hanging rails console ## What does this MR do? Update spring to 1.7.2. ## Why was this MR needed? This fixes hanging rails console issue. ## Related Fixes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/127 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5066
\| * \| \| \| \| \| \| \| \| \| \|	Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2	Kamil Trzcinski	2016-07-04	1	-1/+1
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'git_hooks_better_message' into 'master'	Dmitriy Zaporozhets	2016-07-04	9	-28/+36
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More descriptive message for git hooks and file locks ## What does this MR do? Most of the benefits will be in GitLab EE because we have git hooks there (push rules) and file lock features. Instead of showing "Git operation was rejected by #{hook_name} hook" the actual problem description will be shown. Also you will see a clear message when you edit locked file. ## Why was this MR needed? Because we don't want to confuse our users ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/713 See merge request !5067
\| * \| \| \| \| \| \| \| \| \|	Better message for git hooks and file locks	Valery Sizov	2016-07-04	9	-28/+36
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '13524-keep-around-commits' into 'master'	Douwe Maan	2016-07-04	12	-7/+88
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't garbage collect commits that have related DB records like comments Closes #13524 Also needed for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4101. See merge request !5062
\| * \| \| \| \| \| \| \| \| \|	Document Repository#keep_around	Douwe Maan	2016-07-04	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't garbage collect commits that have related DB records like comments	Douwe Maan	2016-07-04	12	-7/+84
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'downgrade-redis-3-2-2' into 'master'	Robert Speicher	2016-07-03	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq This affects GitLab 8.8 and 8.9. See: * https://github.com/mperham/sidekiq/blob/master/Changes.md#413 * https://gitlab.com/gitlab-org/gitlab-ce/issues/19441 See merge request !5056
\| * \| \| \| \| \| \| \| \| \| \|	Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2	Stan Hu	2016-07-01	2	-1/+2
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See: https://github.com/mperham/sidekiq/blob/master/Changes.md#413 https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master'	Stan Hu	2016-07-03	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update RedCloth to 4.3.2 for CVE-2012-6684 ## What does this MR do? To fix XSS (CVE-2012-6684), upgrade RedCloth to 4.3.2. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Security vulnerability in RedCloth (CVE-2012-6684) should be fixed to provide GitLab as a secure software. ## What are the relevant issue numbers? Closes #19169 cf. !2037, !2071 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [n/a] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [n/a] API support added - Tests - [n/a] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4929