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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document update34519-extend-api-group-secret-variable	Shinya Maeda	2017-07-19	3	-7/+133
\|
*	Add changelog	Shinya Maeda	2017-07-19	1	-0/+4
\|
*	Ini	Shinya Maeda	2017-07-19	4	-0/+321
\|
*	Merge branch 'pawel/update_prometheus' into 'master'	Rémy Coutable	2017-07-19	8	-14/+22
\|\ \| \| \| \| \| \| \| \|	Update Prometheus gem to version that explicitly calls `munmap` See merge request !12955
\| *	Update Prometheus gem to version that explicitly calls `munmap`	Paweł Chojnacki	2017-07-19	8	-14/+22
\|/
*	Merge branch 'rs-remove-describe-symbol-docs' into 'master'	Rémy Coutable	2017-07-19	2	-30/+0
\|\ \| \| \| \| \| \| \| \|	Remove developer documentation about not describing symbols See merge request !12953
\| *	Remove developer documentation about not describing symbolsrs-remove-describe-symbol-docs	Robert Speicher	2017-07-18	2	-30/+0
\| \| \| \| \| \| \| \|	This is now covered by rubocop-rspec.
* \|	Merge branch 'trigger-only-on-official-repo' into 'master'	Marin Jankovski	2017-07-19	1	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Provide option to trigger package build only for official CE and EE repos in .com See merge request !12949
\| * \|	Provide option to trigger build only for official CE and EE repos in .comtrigger-only-on-official-repo	Balasankar C	2017-07-18	1	-0/+3
\| \| \|
* \| \|	Merge branch 'rc/bump-peek-performance_bar' into 'master'	Sean McGivern	2017-07-19	4	-29/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
\| * \| \|	Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_bar	Rémy Coutable	2017-07-18	4	-29/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'gitaly-commits-between' into 'master'	Rémy Coutable	2017-07-19	7	-16/+117
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly commits between Closes gitaly#350 See merge request !12669
\| * \| \| \|	Incorporate Gitaly's Commits#between RPC	Alejandro Rodríguez	2017-07-18	6	-17/+63
\| \| \| \| \|
\| * \| \| \|	Adapt to new Gitaly commit message format	Alejandro Rodríguez	2017-07-18	3	-4/+59
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-structured-logging' into 'master'	Sean McGivern	2017-07-19	4	-0/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add structured logging for Rails processes See merge request !12928
\| * \| \| \| \|	Add structured logging for Rails processessh-structured-logging	Stan Hu	2017-07-18	4	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This introduces JSON logging for Rails views saved to a file called `development_json.log`, `production_json.log`, etc. For example, instead of this unparsable log: ``` Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100 Processing by HomeController#index as HTML Rendered text template within layouts/application (0.0ms) Rendered layouts/_assets.html.erb (2.0ms) Rendered layouts/_top.html.erb (2.6ms) Rendered layouts/_about.html.erb (0.3ms) Rendered layouts/_google_analytics.html.erb (0.4ms) Completed 200 OK in 79ms (Views: 78.8ms \| ActiveRecord: 0.0ms) ``` We get a single line with this: ``` {"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"} ``` Part of #20060
* \| \| \| \| \|	Merge branch '34764-make-project-more-clear' into 'master'	Phil Hughes	2017-07-19	2	-8/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Project nav items Closes #34764 See merge request !12921
\| * \| \| \| \| \|	Rename Project nav items34764-make-project-more-clear	Annabel Dunstone Gray	2017-07-18	2	-8/+8
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '35210-disable-nav-animations' into 'master'	Phil Hughes	2017-07-19	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove transitions on nav link hover Closes #35210 See merge request !12950
\| * \| \| \| \| \|	Remove transitions on nav link hover35210-disable-nav-animations	Annabel Dunstone Gray	2017-07-18	1	-3/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-download-artifacts-alignment' into 'master'	Phil Hughes	2017-07-19	1	-6/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix download artifacts button alignment Closes #35137 See merge request !12942
\| * \| \| \| \| \|	Fix download artifacts button alignmentfix-download-artifacts-alignment	Clement Ho	2017-07-18	1	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '34468-remove-extra-blank-on-admin-on-mobile' into 'master'	Clement Ho	2017-07-18	4	-13/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify width for dropdown-menu on mobile Closes #34468 and #35226 See merge request !12528
\| * \| \| \| \| \| \|	Simplify width for dropdown-menu on mobile	Takuya Noguchi	2017-07-18	4	-13/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Update CHANGELOG.md for 9.3.7	Clement Ho	2017-07-18	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch '32561-opaque-avatar-border-ee-backport' into 'master'	Annabel Dunstone Gray	2017-07-18	3	-8/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update avatar border to be opaque for better stacking -- EE backport Closes #32561 See merge request !12940
\| * \| \| \| \| \|	Update avatar border to be opaque for better stacking32561-opaque-avatar-border-ee-backport	Eric Eastwood	2017-07-18	3	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32561
* \| \| \| \| \| \|	Merge branch '35087-mr-status-misaligned' into 'master'	Annabel Dunstone Gray	2017-07-18	2	-0/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	35087 Fix alignment of controls in mr issuable list Closes #35087 See merge request !12890
\| * \| \| \| \| \| \|	35087 Fix alignment of controls in mr issuable list35087-mr-status-misaligned	tauriedavis	2017-07-17	2	-0/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-disable-test-log-in-ci' into 'master'	Rémy Coutable	2017-07-18	2	-0/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable Rails logging in CI test environments See merge request !12847
\| * \| \| \| \| \| \| \|	Disable Rails logging in CI test environmentsrs-disable-test-log-in-ci	Robert Speicher	2017-07-18	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
* \| \| \| \| \| \| \| \|	Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'	Robert Speicher	2017-07-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix queries duration sorting in Performance Bar Closes #35252 See merge request !12947
\| * \| \| \| \| \| \| \|	Fix queries duration sorting in Performance Bar35252-fix-performance-bar-queries-duration-sorting	Rémy Coutable	2017-07-18	1	-1/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '35129-update-prometheus-docs' into 'master'	Marcia Ramos	2017-07-18	9	-48/+182
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Prometheus documentation for 9.4 Closes #35129 See merge request !12885
\| * \ \ \ \ \ \ \	Fix merge conflicts	Joshua Lambert	2017-07-18	130	-814/+1509
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into ↵	Marcia Ramos	2017-07-18	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update Prometheus admin documentation for 9.4 - docs Closes #35175 See merge request !12903
\| * \| \| \| \| \| \| \|	Fixed typos35175-update-prometheus-admin-documentation-for-9-4-docs	Joshua Lambert	2017-07-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update admin docs	Joshua Lambert	2017-07-17	2	-2/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-gitaly-to-0.21.2' into 'master'fix-ci-table-timing	Robert Speicher	2017-07-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gitaly Server Version to 0.21.2 See merge request !12937
\| * \| \| \| \| \| \| \|	Update Gitaly Server Version to 0.21.2update-gitaly-to-0.21.2	Andrew Newdigate	2017-07-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Clement Ho	2017-07-18	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reset text-align to initial to let elements with dir="auto" align texts to right… Closes #13281 See merge request !12892
\| * \| \| \| \| \| \| \| \|	reset text-align to initial to let elements with dir="auto" align texts to ↵	goshkob	2017-07-18	2	-0/+8
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	right…
* \| \| \| \| \| \| \| \|	Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into ↵	Kamil Trzciński	2017-07-18	5	-3/+100
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a foreign key to `merge_requests.head_pipeline_id` Closes #34065 See merge request !12837
\| * \| \| \| \| \| \| \|	Use batching to clear orphans in head_pipeline migrationbackstage/gb/add-index-and-foreign-key-to-merge-requests	Grzegorz Bizon	2017-07-18	2	-3/+51
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Nullify orphaned head_pipeline_ids in merge_requests	Grzegorz Bizon	2017-07-18	1	-0/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a foreign key to `merge_requests.head_pipeline_id`	Grzegorz Bizon	2017-07-18	4	-3/+44
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'	Robert Speicher	2017-07-18	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Test/Production environment imparity in nokogiri" Closes #34915 See merge request !12842
\| * \| \| \| \| \| \| \| \|	Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_build	Rémy Coutable	2017-07-13	2	-1/+2
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead, install them only for the 'update-knapsack' job. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'request-store-wrap' into 'master'	Rémy Coutable	2017-07-18	10	-30/+258
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add RequestCache to cache via RequestStore See merge request !12920
\| * \| \| \| \| \| \| \|	Remove unneeded asserts and add tests for inactive RequestStore	Lin Jen-Shin	2017-07-18	1	-28/+20
\| \| \| \| \| \| \| \| \|