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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Change border color of job's scroll controllers to $border-color	Filipa Lacerda	2017-06-13	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tidy-up-issues-controller-filters' into 'master'	Douwe Maan	2017-06-13	1	-9/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always check read_issue permissions when loading issue See merge request !12095
\| * \| \| \| \| \| \|	Always check read_issue permissions when loading issuetidy-up-issues-controller-filters	Sean McGivern	2017-06-13	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We never want to skip the check, so that some actions did so was a mistake.
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'	Kamil Trzciński	2017-06-13	2	-6/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not expose internal artifacts hash in build entity Closes #33605 See merge request !12124
\| * \| \| \| \| \| \|	Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposure	Grzegorz Bizon	2017-06-13	2	-6/+3
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-github-clone-wiki' into 'master'	Sean McGivern	2017-06-13	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitHub - Fix token interpolation when cloning wiki repository See merge request !12107
\| * \| \| \| \| \| \|	Add CHANGELOGfix-github-clone-wiki	Douglas Barbosa Alexandre	2017-06-12	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Github - Fix token interpolation when cloning wiki repository	Douglas Barbosa Alexandre	2017-06-12	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2017-06-13	49	-3/+569
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32054-rails-should-use-timestamptz-database-type-for-postgresql' into 'master' Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Closes #32054 See merge request !11229
\| * \| \| \| \| \| \|	Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresql	blackst0ne	2017-06-13	49	-3/+569
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'timestamps_with_timezone'
* \| \| \| \| \| \| \|	Merge branch 'zj-commit-status-sortable-name' into 'master'	Grzegorz Bizon	2017-06-13	3	-2/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle legacy jobs without name Closes #33403 See merge request !12118
\| * \| \| \| \| \| \| \|	Handle legacy jobs without namezj-commit-status-sortable-name	Z.J. van de Weg	2017-06-13	3	-2/+17
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403
* \| \| \| \| \| \| \|	Merge branch 'updating-k8s-page' into 'master'	Phil Hughes	2017-06-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Tectonic to the page. See merge request !12126
\| * \| \| \| \| \| \| \|	Added Tectonic to the page.updating-k8s-page	Eliran Mesika	2017-06-13	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '33564-fix-flaky-test' into 'master'	Sean McGivern	2017-06-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use wait_for_requests instead of sleep 0.3 Closes #33564 See merge request !12122
\| * \| \| \| \| \| \| \|	Use wait_for_requests instead of sleep 0.3	Rémy Coutable	2017-06-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/fix-migrations-testing-support-hooks-order' into 'master'	Sean McGivern	2017-06-13	1	-9/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migrations testing support RSpec hooks order Closes #33583 See merge request !12120
\| * \| \| \| \| \| \| \| \|	Fix migrations testing support RSpec hooks orderfix/gb/fix-migrations-testing-support-hooks-order	Grzegorz Bizon	2017-06-13	1	-9/+7
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'karma-headless-chrome' into 'master'	Tim Zallmann	2017-06-13	11	-168/+41
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace PhantomJS with headless Chrome in frontend test suite See merge request !12036
\| * \| \| \| \| \| \| \|	add CHANGELOG.md entry for !12036karma-headless-chrome	Mike Greiling	2017-06-13	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove phantomjs-specific test hacks	Mike Greiling	2017-06-13	5	-50/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update karma job to use chrome build image created by gitlab-build-images!41	Mike Greiling	2017-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	test new docker image with headless chrome	Mike Greiling	2017-06-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove phantomjs from our frontend dev dependencies	Mike Greiling	2017-06-13	2	-118/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix incorrect equals assertion	Mike Greiling	2017-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	replace PhantomJS with headless Chrome as karma test runner	Mike Greiling	2017-06-13	3	-2/+20
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27586-center-dropdown' into 'master'	Phil Hughes	2017-06-13	2	-1/+14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Center dropdown for pipeline's mini graph Closes #27586 See merge request !12087
\| * \| \| \| \| \| \|	Center dropdown for pipeline's mini graph	Filipa Lacerda	2017-06-13	2	-1/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/33584-atom-layout' into 'master'	Rémy Coutable	2017-06-13	16	-79/+59
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor atom builder by using a layout See merge request !12114
\| * \| \| \| \| \|	Refactor atom builder by using xml.atom layout	Tieu-Philippe KHIM	2017-06-12	16	-79/+59
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix_docs_commits_multiple_files' into 'master'	Rémy Coutable	2017-06-13	2	-1/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions See merge request !12117
\| * \| \| \| \| \|	Documentation bugfix of invalid JSON payload example of Create a commit with ↵	blackst0ne	2017-06-13	2	-1/+6
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	multiple files and actions
* \| \| \| \| \|	Merge branch 'fix-filename-of-artifact-uploader' into 'master'	Grzegorz Bizon	2017-06-13	3	-2/+43
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filename method of GitlabUploader to return always real filename Closes #33524 See merge request !12113
\| * \| \| \| \|	Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploader	Kamil Trzcinski	2017-06-13	3	-2/+43
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-ignore-CVE-2017-5029' into 'master'	Robert Speicher	2017-06-12	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore CVE-2017-5029 in Nokogiri Closes #33597 See merge request !12109
\| * \| \| \| \|	Ignore CVE-2017-5029 in Nokogiri	winh	2017-06-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rc/load-images-in-phantomjs' into 'master'	Robert Speicher	2017-06-12	4	-13/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let PhantomJS load local images See merge request !12003
\| * \| \| \| \| \|	Let PhantomJS load local imagesrc/load-images-in-phantomjs	Rémy Coutable	2017-06-12	4	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change fix a memory leak due to a Webkit bug: https://github.com/ariya/phantomjs/issues/12903 Also: - Whitelist only localhost and 127.0.0.1 in Capybara + JS specs - Blacklist all requests to media such as images, videos, PDFs, CSVs etc. - Log all the requests made. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'	Kamil Trzciński	2017-06-12	7	-31/+77
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set artifact working directory to be in the destination store to prevent unnecessary I/O Closes #33274 See merge request !11905
\| * \| \| \| \| \| \|	Set artifact working directory to be in the destination store to prevent ↵sh-fix-refactor-uploader-work-dir	Stan Hu	2017-06-06	7	-31/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unnecessary I/O Similar to #33218, build artifacts were being uploaded into a CarrierWave temporary directory in the Rails root directory before moved to their final destination, which could cause a copy across filesystems. This merge request refactors the work in !11866 so that any uploader can just override `work_dir` to change the default implementation. Closes #33274
* \| \| \| \| \| \| \|	Merge branch '29010-perf-bar' into 'master'	Robert Speicher	2017-06-12	27	-2/+771
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
\| * \| \| \| \| \| \| \|	DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-bar	Rémy Coutable	2017-06-09	4	-47/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix peek-rblineprof JS	Rémy Coutable	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Ensure peek-performance_bar doesn't break existing functionalities	Rémy Coutable	2017-06-09	3	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Add a feature spec for the performance bar	Rémy Coutable	2017-06-09	1	-0/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix vendor/peek.js so that it can be bundled with Webpack	Rémy Coutable	2017-06-09	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix linting, route, and specs	Rémy Coutable	2017-06-09	7	-18/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Improve the JS for the `p b` shortcut and fix its CSS	Rémy Coutable	2017-06-09	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fix spec failures and add a feature flag for the performance bar	Rémy Coutable	2017-06-09	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Add `p b` to the shortcuts documentation	Rémy Coutable	2017-06-09	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>