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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove documentation about rules that are now enforced by RuboCoprs-rspec-hook-argument-cop	Robert Speicher	2017-08-10	1	-6/+0
\| \| \| \| \| \|	RuboCop is _living_ documentation! :sparkles: [ci skip]
*	Enable the RSpec/HookArgument cop and auto-correct offenses	Robert Speicher	2017-08-10	58	-86/+85
\|
*	Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec	Robert Speicher	2017-08-10	1	-1/+1
\|
*	Merge branch 'jej/security-release-2017-08-10' into 'master'	Stan Hu	2017-08-10	6	-1/+61
\|\ \| \| \| \| \| \| \| \|	Security release 2017-08-10 patch See merge request !13477
\| *	Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10	James Edwards-Jones	2017-08-10	3	-0/+47
\| \| \| \| \| \| \| \| \| \|	Ensure user and hostnames begin with an alnum character in UrlBlocker See merge request !2138
\| *	Merge branch 'import-symlinks-9-3' into 'security-9-3'	James Edwards-Jones	2017-08-10	3	-1/+14
\| \| \| \| \| \| \| \| \| \|	Fix file disclosure via hidden symlinks using the project import (9.3) See merge request !2164
* \|	Merge branch 'filter-nginx-access-logs' into 'master'	Robert Speicher	2017-08-10	2	-3/+71
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter sensitive query string parameters from NGINX access logs Closes #19203 See merge request !13453
\| * \|	Filter sensitive query string parameters from NGINX access logs	Nick Thomas	2017-08-10	2	-3/+71
\| \|/
* \|	Merge branch '21949-add-type-to-changelog' into 'master'	Robert Speicher	2017-08-10	4	-75/+215
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's start labeling our CHANGELOG entries Closes #21949 See merge request !11579
\| * \|	Let's start labeling our CHANGELOG entries	Jacopo	2017-07-22	4	-75/+215
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the type attribute to a CHANGELOG entry. When you create a new entry the software asks for the category of the change and sets the associated type in the file.
* \| \|	Merge branch 'rc/improve-projects-factory' into 'master'	Robert Speicher	2017-08-10	6	-196/+130
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the Project factory to make `creator` defaults to `namespace.owner` See merge request !13412
\| * \| \|	Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factory	Rémy Coutable	2017-08-10	1	-77/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Improve the Project factory to make `creator` defaults to namespace.owner	Rémy Coutable	2017-08-10	5	-119/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improves the `create_templates` transient attribute and use `project.project_feature.update_columns` instead of `project.project_feature.update_attributes!` since it's faster. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'breakpoint-checker-performance' into 'master'	Filipa Lacerda	2017-08-10	12	-92/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase performance of the breakpoint size checker See merge request !13454
\| * \| \| \|	removed global use of breakpoint checkerbreakpoint-checker-performance	Phil Hughes	2017-08-10	11	-34/+18
\| \| \| \| \|
\| * \| \| \|	Increase performance of the breakpoint size checker	Phil Hughes	2017-08-10	2	-61/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-fix-prom-metrics' into 'master'	Stan Hu	2017-08-10	2	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong method call on prometheus histogram See merge request !13470
\| * \| \| \| \|	Fix wrong method call on prometheus histogramzj-fix-prom-metrics	Z.J. van de Weg	2017-08-10	2	-5/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-fix-stubbed-user-factory' into 'master'	Rémy Coutable	2017-08-10	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually assign `notification_email` in the User factory when stubbed See merge request !13395
\| * \| \| \| \| \|	Manually assign `notification_email` in the User factory when stubbedrs-fix-stubbed-user-factory	Robert Speicher	2017-08-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we assign this value in the model via a callback conditionally on `email_changed?`, this never gets set when using `build_stubbed`, resulting in a "can't be blank" validation error on this field. In this case, we can just assign it manually to the same value as `email`, which is generated via a sequence.
* \| \| \| \| \| \|	Merge branch '36039-document-new-all-in-one-helm-chart-docs' into 'master'	Achilleas Pipinellis	2017-08-10	4	-12/+182
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document new all-in-one Helm chart - docs Closes #36039 See merge request !13333
\| * \| \| \| \| \| \|	Document new all-in-one Helm chart - docs	Joshua Lambert	2017-08-10	4	-12/+182
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/add-toc' into 'master'	Achilleas Pipinellis	2017-08-10	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start using 'toc' in yaml frontmatter to explicitly disable it See merge request !13310
\| * \| \| \| \| \|	Start using 'toc' in yaml frontmatter to explicitly disable itdocs/add-toc	Achilleas Pipinellis	2017-08-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/107
* \| \| \| \| \| \|	Merge branch '29811-fix-line-number-alignment' into 'master'	Annabel Dunstone Gray	2017-08-10	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix line numbers not matching up to code in code viewer. Closes #29811 See merge request !13403
\| * \| \| \| \| \| \|	Fix line numbers not matching up to code in code viewer.	Trevor Flynn	2017-08-10	2	-1/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'	Filipa Lacerda	2017-08-10	2	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove affix plugin from issuable sidebar with new navigation See merge request !13449
\| * \| \| \| \| \| \|	Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-nav	Phil Hughes	2017-08-10	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This isn't required with the new navigation as it is always position fixed so we are just creating a scroll event listener that will never actually do anything
* \| \| \| \| \| \| \|	Merge branch '36158-new-issue-button' into 'master'	Phil Hughes	2017-08-10	3	-3/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render new issue link in failed job as a regular link instead of a UJS one Closes #36158 See merge request !13450
\| * \| \| \| \| \| \| \|	Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-button	Filipa Lacerda	2017-08-10	3	-3/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'db-changes-mr-template' into 'master'	Rémy Coutable	2017-08-10	1	-0/+73
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a template for database changes See merge request !12355
\| * \| \| \| \| \| \| \|	Added a template for database changes	Yorick Peterse	2017-08-10	1	-0/+73
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This template includes a rather large (but fairly easy to follow) checklist. This checklist should hopefully take away quite a bit of work from database specialists by requiring authors to provide all the necessary info. [ci skip]
* \| \| \| \| \| \| \|	Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'	Sean McGivern	2017-08-10	4	-27/+73
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflicting redirect search See merge request !13357
\| * \| \| \| \| \| \|	Fix stylemk-fix-case-insensitive-redirect-matching	Michael Kozono	2017-08-09	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unnecessary work for MySQL	Michael Kozono	2017-08-08	1	-1/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog entry	Michael Kozono	2017-08-08	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix conflicting redirect search	Michael Kozono	2017-08-08	3	-27/+61
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '36185-or-separator' into 'master'	Phil Hughes	2017-08-10	2	-5/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aligns OR separater to center properly Closes #36185 See merge request !13446
\| * \| \| \| \| \| \|	Fix linter error36185-or-separator	Filipa Lacerda	2017-08-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Aligns OR separater to center properly	Filipa Lacerda	2017-08-10	2	-5/+9
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '35342-re2-in-upgrade-docs' into 'master'	Rémy Coutable	2017-08-10	6	-0/+53
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include RE2 in the upgrade docs See merge request !13448
\| * \| \| \| \| \| \|	Include RE2 in the upgrade docs	Nick Thomas	2017-08-10	6	-0/+53
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-unused-redirect_to_external_issue_tracker' into 'master'	Rémy Coutable	2017-08-10	1	-12/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused `redirect_to_external_issue_tracker` method See merge request !13444
\| * \| \| \| \| \| \|	Remove unused `redirect_to_external_issue_tracker` method	Mehdi Lahmam	2017-08-10	1	-12/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Its usage has been removed at 2fa22a0729.
* \| \| \| \| \| \|	Merge branch 'jarv/update-gemfile-lock' into 'master'	Rémy Coutable	2017-08-10	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating Gemfile.lock for rubocop-rspec dependecy. See merge request !13410
\| * \| \| \| \| \|	Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lock	John Jarvis	2017-08-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GDK pipeline is failing with this error: ``` Downloading rubocop-rspec-1.15.1 revealed dependencies not in the API or the lockfile (rubocop (>= 0.42.0)). Either installing with `--full-index` or running `bundle update rubocop-rspec` should fix the problem. ``` Updated lockfile by running the bundle update. `gdk install` works now.
* \| \| \| \| \| \|	Merge branch 'gitlab-infrastructure-archive-route-quick-fix' into 'master'	Rémy Coutable	2017-08-10	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	alternative route for download archive See merge request !13439
\| * \| \| \| \| \| \|	alternative route for download archive	haseeb	2017-08-10	1	-0/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fixed-sticky-stats-box-commit-view' into 'master'	Filipa Lacerda	2017-08-10	6	-14/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the sticky changes bar on commits page See merge request !13343
\| * \| \| \| \| \| \|	Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-view	Phil Hughes	2017-08-09	6	-14/+23
\| \| \| \| \| \| \| \|