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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added Rubocop config for background migrationsreviewing-db-changes	Yorick Peterse	2017-11-23	13	-0/+104
\| \| \| \| \| \| \| \| \|	This adds a Rubocop configuration file specific to lib/gitlab/background_migrations. This configuration will be used to (hopefully) make reviewing background migrations easier by enforcing stricter rules compared to the rest of GitLab. Because this configuration is directory specific it will only affect background migrations.
*	Merge branch '32098-environments-reusable' into 'master'	Phil Hughes	2017-11-23	32	-804/+933
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve environments performance Closes #32098 See merge request gitlab-org/gitlab-ce!15484
\| *	Improve environments performance	Filipa Lacerda	2017-11-23	32	-804/+933
\|/
*	Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'	Sean McGivern	2017-11-23	1	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "EE Compatibility Check Job Fails Unexpectedly" Closes #40463 See merge request gitlab-org/gitlab-ce!15555
\| *	In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedly	Rémy Coutable	2017-11-23	1	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Generate the patch against `origin/#{branch}` instead of just `#{branch}`	Rémy Coutable	2017-11-22	1	-1/+1
\| \|
\| *	Try to always find the merge base using `origin/#{branch}` instead of just ↵	Rémy Coutable	2017-11-22	1	-1/+1
\| \| \| \| \| \| \| \|	`#{branch}`
* \|	Merge branch 'git-user-encoding' into 'master'	Rémy Coutable	2017-11-23	5	-8/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding bugs in Gitlab::Git::User Closes #40330 See merge request gitlab-org/gitlab-ce!15539
\| * \|	Fix encoding bugs in Gitlab::Git::User	Jacob Vosmaer (GitLab)	2017-11-23	5	-8/+32
\|/ /
* \|	Merge branch ↵	Kamil Trzciński	2017-11-23	3	-13/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip' into 'master' Avoid deactivation when pipeline schedules execute a branch includes `[ci skip]` comment Closes #37991 See merge request gitlab-org/gitlab-ce!15405
\| * \|	Add change log	Shinya Maeda	2017-11-23	1	-0/+6
\| \| \|
\| * \|	Fix testing order	Shinya Maeda	2017-11-23	1	-1/+1
\| \| \|
\| * \|	Add a test	Shinya Maeda	2017-11-23	1	-12/+19
\| \| \|
\| * \|	Avoid deactivation when pipeline schedules execute a commit includes `[ci skip]`	Shinya Maeda	2017-11-23	1	-1/+1
\| \| \|
* \| \|	Merge branch 'feature/sm/40147-add-environment_scope-to-cluster-table' into ↵	Kamil Trzciński	2017-11-23	2	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add environment_scope to cluster table See merge request gitlab-org/gitlab-ce!15419
\| * \| \|	Add environment_scope to cluster table	Shinya Maeda	2017-11-22	2	-0/+16
\| \|/ /
* \| \|	Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵	Filipa Lacerda	2017-11-23	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534
\| * \| \|	Add CSS hidden class in mailer layout39653-hide-section_start-and-section_end-in-pipeline-emails	Alessio Caiazza	2017-11-22	1	-0/+4
\| \|/ /
* \| \|	Merge branch '40445-upgrade-fe-babel-libraries' into 'master'	Filipa Lacerda	2017-11-23	2	-315/+490
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Upgrade FE Babel Libraries" Closes #40445 See merge request gitlab-org/gitlab-ce!15544
\| * \| \|	Upgraded babel related libraries40445-upgrade-fe-babel-libraries	Tim Zallmann	2017-11-22	2	-315/+490
\| \| \| \|
* \| \| \|	Merge branch 'jivl-general-icons' into 'master'	Tim Zallmann	2017-11-23	4	-10/+15
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change star, filter and settings icons to the their sprite based replacements Closes #33757 See merge request gitlab-org/gitlab-ce!15412
\| * \| \|	Change star, filter and settings icons to the their sprite based replacements	Jose Ivan Vargas Lopez	2017-11-23	4	-10/+15
\|/ / /
* \| \|	Update CHANGELOG.md for 10.2.1	Michael Kozono	2017-11-22	2	-5/+7
\| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch '32620-speed-up-unicorn-specs' into 'master'	Rémy Coutable	2017-11-22	6	-23/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
\| * \| \|	Speed up Unicorn specs by using a dummy Rack application instead of GitLab	Nick Thomas	2017-11-22	6	-23/+19
\| \| \| \|
* \| \| \|	Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'	Clement Ho	2017-11-22	4	-1/+30
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add edit button to mobile file view Closes #28377 See merge request gitlab-org/gitlab-ce!15199
\| * \| \|	Add edit button to mobile file view	Travis Miller	2017-11-22	4	-1/+30
\| \| \| \|
* \| \| \|	Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'	Tim Zallmann	2017-11-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing MR widget status icons Closes #40283 See merge request gitlab-org/gitlab-ce!15533
\| * \| \| \|	Fix missing MR widget status icons40283-fix-missing-mr-widget-status-icons	Eric Eastwood	2017-11-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40283 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/d01d509bd8612f9879fa762de8ea3763bcff81cf
* \| \| \| \|	Merge branch '40444-upgrade-axios-from-0-16-2-to-0-17-1' into 'master'	Filipa Lacerda	2017-11-22	2	-10/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Upgrade axios from 0.16.2 to 0.17.1" Closes #40444 See merge request gitlab-org/gitlab-ce!15543
\| * \| \| \| \|	Updated axios40444-upgrade-axios-from-0-16-2-to-0-17-1	Tim Zallmann	2017-11-22	2	-10/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'pawel/disable_prometheus_metrics' into 'master'	Stan Hu	2017-11-22	2	-3/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549
\| * \| \| \| \| \|	Force disable Prometheus metrics	Pawel Chojnacki	2017-11-22	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready, Prometheus metrics will not work and cause issues such as #40457.
* \| \| \| \| \| \|	Merge branch 'jivl-replace-vue-resource-prometheus-dashboard' into 'master'	Filipa Lacerda	2017-11-22	3	-26/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace vue-resource for axios in the Prometheus Dashboard See merge request gitlab-org/gitlab-ce!15547
\| * \| \| \| \| \| \|	Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboard	Jose Ivan Vargas	2017-11-22	3	-26/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38877-disable-autocomplete-in-filtered-search' into 'master'	Clement Ho	2017-11-22	3	-1/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables autocomplete in filtered search Closes #38877 See merge request gitlab-org/gitlab-ce!15477
\| * \| \| \| \| \| \| \|	Disables autocomplete in filtered search	Jacopo	2017-11-20	3	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets `autocomplete=off` to issuable filtered serarch.
* \| \| \| \| \| \| \| \|	Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'	Clement Ho	2017-11-22	4	-1/+55
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reply quote keyboard shortcut on MRs Closes #40295 See merge request gitlab-org/gitlab-ce!15523
\| * \| \| \| \| \| \| \|	Fix reply quote keyboard shortcut on MRs40295-fix-reply-quote-shortcut-on-mr	Eric Eastwood	2017-11-21	4	-1/+55
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40295
* \| \| \| \| \| \| \|	Merge branch 'qa/gb/backport-geo-integration-tests-commons' into 'master'	Rémy Coutable	2017-11-22	11	-4/+153
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport QA code that belongs to CE from EE Geo Closes #40344 See merge request gitlab-org/gitlab-ce!15536
\| * \| \| \| \| \| \| \|	Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commons	Rémy Coutable	2017-11-22	11	-4/+153
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'qa/gb/add-geo-integration-tests' into 'master' See merge request gitlab-org/gitlab-ee!3294
* \| \| \| \| \| \| \|	Merge branch 'improve-extra-queries-output' into 'master'	Rémy Coutable	2017-11-22	2	-5/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve output for extra queries in specs See merge request gitlab-org/gitlab-ce!15537
\| * \| \| \| \| \| \| \|	Improve output for extra queries in specsimprove-extra-queries-output	Sean McGivern	2017-11-22	2	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, this used `Array#-`, which would remove all queries that matches the query text in the original set. However, sometimes we have a problem with parameterised queries, where the query text is identical both times, so we'd run a query N times instead of once, and it would be hidden from the output. Replace the logic to only remove a given query N times from the actual log, where N is the number of times it appears in the expected log.
* \| \| \| \| \| \| \| \|	Merge branch 'docs-install-locale-compile' into 'master'	Rubén Dávila	2017-11-22	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to using gettext:compile instead of gettext:pack in the install docs Closes #40360 See merge request gitlab-org/gitlab-ce!15501
\| * \| \| \| \| \| \| \|	Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compile	DJ Mountney	2017-11-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs This skips the step that updates the .pot files with changes in the codebase, which can take extra time, and isn't required during install.
* \| \| \| \| \| \| \| \|	Merge branch '40354-improve-ee_compat_check' into 'master'	Sean McGivern	2017-11-22	2	-32/+39
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to find the merge-base against the canonical master and name the remotes See merge request gitlab-org/gitlab-ce!15495
\| * \| \| \| \| \| \| \| \|	Try to find the merge-base against the canonical master	Rémy Coutable	2017-11-22	2	-32/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'group-new-miletone-breadcrumb' into 'master'	Filipa Lacerda	2017-11-22	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed new group milestone breadcrumb Closes #40338 See merge request gitlab-org/gitlab-ce!15511
\| * \| \| \| \| \| \| \| \|	Fixed new group milestone breadcrumb	Phil Hughes	2017-11-22	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40338
* \| \| \| \| \| \| \| \| \|	Merge branch '39720-group-milestone-sorting' into 'master'	Sean McGivern	2017-11-22	6	-1/+133
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230