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 'use-merge-requests-diff-id-column' into 'master'	Douwe Maan	2017-11-23	15	-8/+197
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
\| * \| \| \| \| \| \| \|	Use latest_merge_request_diff association	Sean McGivern	2017-11-23	15	-8/+197
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
* \| \| \| \| \| \| \|	Merge branch 'jk-group-mentions-fix' into 'master'	Sean McGivern	2017-11-23	15	-36/+51
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
\| * \| \| \| \| \| \| \|	Fix link text from group context	Jarka Kadlecova	2017-11-23	15	-36/+51
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'feature/disable-password-authentication' into 'master'	Douwe Maan	2017-11-23	52	-110/+299
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow password authentication to be disabled entirely Closes #37320 See merge request gitlab-org/gitlab-ce!15223
\| * \| \| \| \| \| \| \| \|	Allow password authentication to be disabled entirely	Markus Koller	2017-11-23	52	-110/+299
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'	Kamil Trzciński	2017-11-23	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures See merge request gitlab-org/gitlab-ce!15566
\| * \| \| \| \| \| \| \| \|	Remove cluster_id from ↵	Shinya Maeda	2017-11-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	20171013104327_migrate_gcp_clusters_to_new_clusters_architectures
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/cross-link-default-branch' into 'master'	Marcia Ramos	2017-11-23	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cross link default branch docs to issue closing pattern docs Closes #40449 See merge request gitlab-org/gitlab-ce!15546
\| * \| \| \| \| \| \| \| \| \|	Cross link default branch docs to issue closing pattern docsdocs/cross-link-default-branch	Achilleas Pipinellis	2017-11-22	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/redirect-fix' into 'master'	Marcia Ramos	2017-11-23	9	-13/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the redirect location wording Closes gitlab-com/gitlab-docs#142 See merge request gitlab-org/gitlab-ce!15572
\| * \| \| \| \| \| \| \| \| \| \|	Fix the redirect location wording	Achilleas Pipinellis	2017-11-23	9	-13/+11
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-com/gitlab-docs/issues/142
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tz-update-vue-libraries' into 'master'	Phil Hughes	2017-11-23	2	-79/+70
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated all Vue libraries See merge request gitlab-org/gitlab-ce!15554
\| * \| \| \| \| \| \| \| \| \|	Updated all Vue librariestz-update-vue-libraries	Tim Zallmann	2017-11-23	2	-79/+70
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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