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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Allow bulk_perform_and_wait wait timeout to be overridden	Douwe Maan	2018-02-26	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Extract WaitableWorker out of AuthorizedProjectsWorker	Douwe Maan	2018-02-26	5	-114/+145
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master'	Nick Thomas	2018-02-26	2	-10/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of hard-coded user/project/group names that could clash with DB sequences See merge request gitlab-org/gitlab-ce!17290
\| * \| \| \| \| \|	Get rid of hard-coded user/project/group names that could clash with DB ↵	Rémy Coutable	2018-02-26	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sequences Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'jprovazn-issuable-data' into 'master'	Filipa Lacerda	2018-02-26	3	-18/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't convert issuable_initial_data into JSON See merge request gitlab-org/gitlab-ce!17318
\| * \| \| \| \| \|	Don't convert issuable_initial_data into JSONjprovazn-issuable-data	Jan Provaznik	2018-02-26	3	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
* \| \| \| \| \| \|	Merge branch '43598-fix-duplicate-label-load-failure' into 'master'	Phil Hughes	2018-02-26	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Group labels load failure when there are duplicate labels present Closes #43598 See merge request gitlab-org/gitlab-ce!17353
\| * \| \| \| \| \| \|	Add changelog entry	Kushal Pandya	2018-02-26	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use imported `DropdownUtils`	Kushal Pandya	2018-02-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'	Douwe Maan	2018-02-26	5	-5/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respond with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
\| * \| \| \| \| \| \| \|	Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-exist	Michael Kozono	2018-02-24	5	-5/+23
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'grpc-unavailable-restart' into 'master'	Douwe Maan	2018-02-26	7	-131/+250
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed Closes gitaly#1036 See merge request gitlab-org/gitlab-ce!17293
\| * \| \| \| \| \| \| \|	Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed	Jacob Vosmaer (GitLab)	2018-02-26	7	-131/+250
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.5.2	Ian Baum	2018-02-25	13	-60/+21
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'backport-qa_78' into 'master'	Grzegorz Bizon	2018-02-25	15	-13/+167
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA BACKPORT - Test merge request rebase See merge request gitlab-org/gitlab-ce!17186
\| * \| \| \| \| \|	Fix specsbackport-qa_78	Felipe Artur	2018-02-23	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Small review changes	Felipe Artur	2018-02-22	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	test merge request rebase	Felipe Artur	2018-02-19	15	-14/+167
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'minimal-fix-for-artifacts-service' into 'master'	Grzegorz Bizon	2018-02-24	3	-18/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minimal fix for artifacts service Closes #43022 See merge request gitlab-org/gitlab-ce!17313
\| * \| \| \| \| \| \|	Revert "Revert "Use Dir.mktmpdir""	Shinya Maeda	2018-02-24	1	-15/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 34e16110e0fbe29c40fe984d4715ca5dcdaef508.
\| * \| \| \| \| \| \|	Revert "Use Dir.mktmpdir"minimal-fix-for-artifacts-service	Shinya Maeda	2018-02-24	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 28c6a6b04436230e6e9b29855e4d4d4f88d9a554.
\| * \| \| \| \| \| \|	Use Dir.mktmpdir	Shinya Maeda	2018-02-24	1	-15/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change FileUtils.cp to FileUtils.copy	Shinya Maeda	2018-02-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bring back the initial commit	Shinya Maeda	2018-02-24	2	-25/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add chnagelog	Shinya Maeda	2018-02-24	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed static analysys	Shinya Maeda	2018-02-24	2	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Check if the latest permanent file exists before remove file. Add tests.	Shinya Maeda	2018-02-23	2	-16/+31
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Copy original file to temp file always to prevent data loss	Shinya Maeda	2018-02-23	2	-17/+33
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Minimal fix for artifacts service	Kamil Trzciński	2018-02-23	1	-5/+26
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'refactor/move-filtered-search-vue-component' into 'master'	Clement Ho	2018-02-24	6	-108/+114
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move RecentSearchesDropdownContent vue component See merge request gitlab-org/gitlab-ce!16951
\| * \| \| \| \| \| \|	Move RecentSearchesDropdownContent vue component	George Tsiolis	2018-02-22	6	-108/+114
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-02-23	1	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43570-localstorage-clear-error-when-feature-test-fails-before-visiting-page' into 'master' Resolve "localStorage.clear() error when Capybara test fails before visiting page" Closes #43570 See merge request gitlab-org/gitlab-ce!17339
\| * \| \| \| \| \| \| \|	prevent localStorage.clear from running when it would cause an error	Mike Greiling	2018-02-23	1	-2/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-02-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-exist' into 'master' Fix deletion attempts on dropped tables in specs Closes #42897 See merge request gitlab-org/gitlab-ce!17340
\| * \| \| \| \| \| \| \| \|	Fix deletion attempts on dropped tables	Michael Kozono	2018-02-23	1	-2/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'boards-bundle-refactor' into 'master'	Jacob Schatz	2018-02-23	5	-5/+9
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored use of boards/boards_bundle.js and created a dispatcher import See merge request gitlab-org/gitlab-ce!17145
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 'boards-bundle-refactor'	Jacob Schatz	2018-02-23	550	-3226/+7463
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/webpack.config.js
* \| \| \| \| \| \| \| \|	Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'	Jacob Schatz	2018-02-23	4	-5/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored webpack bundle tag for deploy keys See merge request gitlab-org/gitlab-ce!17324
\| * \| \| \| \| \| \| \| \|	Removed webpack tag	Constance Okoghenun	2018-02-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactor	Constance Okoghenun	2018-02-23	3	-4/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-webpack-merge-conflicts' into 'master'	Jacob Schatz	2018-02-23	1	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce webpack merge conflicts See merge request gitlab-org/gitlab-ce!17328
\| * \| \| \| \| \| \| \| \|	move webpack bundles we intend to keep below the list of bundles we're ↵reduce-webpack-merge-conflicts	Mike Greiling	2018-02-23	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactoring to reduce conflicts
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-issues-show' into 'master'	Jacob Schatz	2018-02-23	3	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove issue_show webpack bundle See merge request gitlab-org/gitlab-ce!17326
\| * \| \| \| \| \| \| \| \|	remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-show	Mike Greiling	2018-02-23	3	-5/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'backport_custom_metrics_ce_components' into 'master'	Robert Speicher	2018-02-23	16	-92/+111
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport custom metrics ce components See merge request gitlab-org/gitlab-ce!17300
\| * \| \| \| \| \| \| \| \| \|	Backport custom metrics ce components	Paweł Chojnacki	2018-02-23	16	-92/+111
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '29497-pages-custom-domain-dns-verification' into 'master'	Robert Speicher	2018-02-23	52	-22/+1358
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Domain validation for Pages custom domains" (master branch) Closes #29497, #42971, and #42083 See merge request gitlab-org/gitlab-ce!17311
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into '29497-pages-custom-domain-dns-verification'	Robert Speicher	2018-02-23	25	-119/+225
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \| \|	Log pages domain verification changes to application.log	Nick Thomas	2018-02-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add DNS verification to Pages custom domains	Nick Thomas	2018-02-23	52	-22/+1357
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|