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

	Commit message (Collapse)	Author	Age	Files	Lines
*	update webpack to v3.5.436152-enable-scope-hoisting-with-webpack	Mike Greiling	2017-08-15	2	-4/+4
\|
*	enable webpack scope hoisting	Mike Greiling	2017-08-15	3	-4/+7
\|
*	Merge branch '36174-show-error-message-for-500-in-tests' into 'master'	Rémy Coutable	2017-08-11	2	-1/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Show error message for API 500 error in tests Closes #36174 See merge request !13502
\| *	Show error message for API 500 error in tests, and	Lin Jen-Shin	2017-08-11	2	-1/+18
\| \| \| \| \| \| \| \|	document have_gitlab_http_status
* \|	Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into ↵	Rémy Coutable	2017-08-11	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Do not run the `ee_compat_check` job for stableish branches Closes #35131 See merge request !13497
\| *	Do not run the `ee_compat_check` job for stableish branches35131-do-not-run-ee_compat_check-for-stableish-branches	Rémy Coutable	2017-08-11	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch ↵	Yorick Peterse	2017-08-11	2	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36328-deserializemergerequestdiffsandcommits-fails-due-to-null-too_large-column-9-5-rc1' into 'master' Fix merge request diff deserialisation when too_large was absent Closes #36328 See merge request !13500
\| * \|	Fix merge request diff deserialisation when too_large was absent	Sean McGivern	2017-08-11	2	-0/+13
\| \|/ \| \| \| \| \| \| \| \|	Not all diffs in st_diffs had the too_large attribute set at all, but the column is non-nullable. Explicitly cast to boolean to avoid that problem.
* \|	Merge branch 'rs-rspec-hook-argument-cop' into 'master'	Rémy Coutable	2017-08-11	59	-92/+85
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Enable the RSpec/HookArgument cop and auto-correct offenses See merge request !13484
\| * \|	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
\| \| \|
* \| \|	Merge branch 'fix-36308' into 'master'	Rémy Coutable	2017-08-11	1	-5/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Closes #36308 See merge request !13488
\| * \| \|	Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb	Mehdi Lahmam	2017-08-11	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It closes #36308
* \| \| \|	Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'	Douwe Maan	2017-08-11	3	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bumps omniauth-ldap gem version to 2.0.4 Closes #25637 See merge request !13465
\| * \| \| \|	Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4	Tiago Botelho	2017-08-11	3	-3/+7
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'zj-ref-path-monospace' into 'master'	Douwe Maan	2017-08-11	2	-1/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix 404 on jobs details page See merge request !13459
\| * \| \|	Fix 404 on link pathzj-ref-path-monospace	Z.J. van de Weg	2017-08-10	2	-1/+5
\| \| \| \|
* \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-08-11	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	French Translation - Missing "r" in "Fouché" word. It comes from "fourcher" verb. See merge request !13491
\| * \| \| \|	Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.	Olivier DOSSMANN	2017-08-11	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gitlab-git-expose-raw-log' into 'master'	Sean McGivern	2017-08-11	1	-16/+17
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose the raw_log method See merge request !13434
\| * \| \| \|	Expose the raw_log methodgitlab-git-expose-raw-log	Jacob Vosmaer	2017-08-09	1	-16/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch '36270-collapsed-sidebar-scroll' into 'master'	Phil Hughes	2017-08-11	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove horizontal scroll on collapsed sidebar Closes #36270 See merge request !13458
\| * \| \| \| \|	Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scroll	Annabel Dunstone Gray	2017-08-10	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-typos' into 'master'36327-tooltip	Rémy Coutable	2017-08-11	3	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix minor typos in views Closes #36317 See merge request !13487
\| * \| \| \| \| \|	Fix minor typos in views	Mehdi Lahmam	2017-08-11	3	-4/+4
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36317.
* \| \| \| \| \|	Merge branch 'docs-update-docs' into 'master'	Achilleas Pipinellis	2017-08-11	2	-59/+33
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update user docs index See merge request !13471
\| * \| \| \| \|	Docs: update user docs index	Marcia Ramos	2017-08-11	2	-59/+33
\|/ / / / /
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Jose Ivan Vargas	2017-08-10	170	-696/+1246
\|\ \ \ \ \
\| * \ \ \ \	Merge branch '36192-change-ha-docs-to-update-using-efs-as-nfs' into 'master'	Stan Hu	2017-08-10	1	-0/+4
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change HA docs to update using EFS as NFS" Closes #36192 See merge request !13400
\| \| * \| \| \|	Update nfs.md with information on AWS EFS and Burst Credit usage and how to ↵36192-change-ha-docs-to-update-using-efs-as-nfs	John Woods	2017-08-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	increase Burst Credit limits and also limit the need for AWS to access EFS by using FS Cache.
\| * \| \| \| \|	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
\| \|/ / / / / / / / / /