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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Parse the cached value when the it is false	Douglas Barbosa Alexandre	2019-06-25	1	-1/+34
\|
*	Squelch output of ActiveSupport::Cache::NullStore in tests	Stan Hu	2019-06-25	1	-0/+7
\| \| \| \| \| \|	When a spec fails relating to the cache, the job log can easily exceed the maximum length and make it harder to see the actual issue (e.g. https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/239803017).
*	Merge branch ↵	Filipa Lacerda	2019-06-25	2	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
\| *	Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestones	Dmitriy Zaporozhets	2019-06-24	2	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch ↵	Grzegorz Bizon	2019-06-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'require-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds' into 'master' Pipeline must be present if "Pipeline must succeed" is set See merge request gitlab-org/gitlab-ce!29926
\| * \|	Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds	Fabio Pitino	2019-06-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user sets only_allow_merge_if_pipeline_succeeds, also named as "Pipeline must succeed" project setting, we require the pipeline to be present. This solves race condition issues especially with external CI providers when a build is triggered externally but no pipelines are created in GitLab yet. Document that a head pipeline is expected when using "Pipeline must succeed" setting. Also explain limitations with the use of only/except where there may not be any jobs created and the merge request will not be allowed to be merged.
* \| \|	Move Vuex action helper spec to Jest	Mark Florian	2019-06-25	2	-5/+168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is largely a straight-forward copy of the Karma spec, with the usual Karma->Jest necessary changes. This also fixes a bug in the implementation that was causing the tests to fail, when run on Jest/node, whereby actions that return rejected promises would always fail the given test. This was due to those rejections not being caught in the same call stack in which they were created.
* \| \|	Fix broken worktree test	GitalyBot	2019-06-25	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
* \| \|	Merge branch 'sh-recover-ee-schema-backport-migration-failure' into 'master'	Rémy Coutable	2019-06-25	1	-0/+41
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent EE backport migrations from running if CE is not migrated Closes #63612 See merge request gitlab-org/gitlab-ce!30002
\| * \| \|	Prevent EE backport migrations from running if CE is not migratedsh-recover-ee-schema-backport-migration-failure	Stan Hu	2019-06-25	1	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a user upgraded to any GitLab 11.x EE version but switched back to CE, it's possible the state of the EE tables are not in the right state for the EE backport migration to work properly. In particular, there were three tables that had trouble: * epics * geo_event_log * vulnerability_feedback The EE backport migration would fail while trying to add foreign key constraints because a key didn't exist in the table. This happens because any EE migration that add or removed columns between v11.0.0 and v11.11.3 are not guaranteed to be applied in an CE installation. The EE backport schema does not individually backport these migrations. We now check if certain columns are present to determine whether the backport migration is in the proper state. CE users are required to upgrade to v11.11.3 EE if they ever installed EE previously before they can go back to v12.x CE. Tested via: ``` git checkout -f v11.0.0-ee bundle exec rake db:reset git checkout .; git checkout -f v11.11.3 bundle exec rake db:migrate git checkout .; git checkout -f v12.0.0 bundle exec rake db:migrate <failure happens> ```
* \| \| \|	Keep empty folders in the tree list	Denys Mishunov	2019-06-25	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When removing the last file from a folder in WebIDE, do not remove the folder from the view. We keep those to give users possibility to re-upload files to the same folders. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60860
* \| \| \|	Allow autocompleting scoped labels	Martin Hanzel	2019-06-25	1	-3/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `:` key will no longer exit out of the autocomplete dialog, allowing auto-completion of labels with colons in them.
* \| \| \|	Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flag	Vladimir Shushlin	2019-06-25	4	-45/+79
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* \| \|	Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-tracking	Heinrich Lee Yu	2019-06-25	7	-25/+175
\| \| \| \| \| \| \| \| \| \| \| \|	Changes migration and all other places the attribute is used
* \| \|	Merge branch 'refactor_deployment_cluster' into 'master'	Stan Hu	2019-06-24	2	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
\| * \| \|	Rename method to not clash with #clusterrefactor_deployment_cluster	Thong Kuah	2019-06-24	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will introduce #cluster at a later stage. Also deprecate this method
* \| \| \|	Change HTTP Status Code when repository disabled	Sam Battalio	2019-06-24	2	-12/+12
\| \|/ / \|/\| \|
* \| \|	Renew Let's Encrypt certificates	Vladimir Shushlin	2019-06-24	4	-0/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* \| \|	Merge branch 'sh-optimize-todos-controller' into 'master'	Douglas Barbosa Alexandre	2019-06-24	1	-0/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
\| * \| \|	Eliminate N+1 queries in Dashboard::TodosController	Stan Hu	2019-06-24	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* \| \| \|	Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'	Jan Provaznik	2019-06-24	1	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Runner tags search dropdown is empty" Closes #63656 See merge request gitlab-org/gitlab-ce!29985
\| * \| \| \|	Return all runner tags when search is empty63656-runner-tags-search-dropdown-is-empty	Dmitriy Zaporozhets	2019-06-24	1	-4/+4
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Revert "Merge branch..."	Kamil Trzciński	2019-06-24	3	-10/+10
\| \|/ / \|/\| \| \| \| \| \| \| \|	This reverts merge request !29832
* \| \|	Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'	Mike Greiling	2019-06-24	1	-0/+58
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
\| * \| \|	Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboard	Jose Vargas	2019-06-21	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge request just adds the column chart component without integrating it to the dashboard
* \| \| \|	Merge branch 'divergence-graph-fe-rendering' into 'master'	Filipa Lacerda	2019-06-24	3	-0/+193
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
\| * \| \| \|	Render branch divergance graph with Vue	Phil Hughes	2019-06-24	3	-0/+193
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'search-blob-basenames' into 'master'	Kamil Trzciński	2019-06-24	2	-10/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
\| * \| \| \|	Build correct basenames for title search resultssearch-blob-basenames	Markus Koller	2019-06-20	2	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* \| \| \| \|	Add name & search parameters to project environments API	Lee Tickett	2019-06-24	1	-0/+41
\| \| \| \| \|
* \| \| \| \|	Merge branch '52366-improved-group-lists-ui' into 'master'	Phil Hughes	2019-06-24	2	-12/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improved group lists UI" Closes #52366 See merge request gitlab-org/gitlab-ce!26542
\| * \| \| \| \|	Improve group list UI	Dennis Tang	2019-06-24	2	-12/+7
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* \| \| \| \|	Merge branch 'ci-pipeline-build-seed-spec-refactor' into 'master'	Kamil Trzciński	2019-06-24	1	-47/+43
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs See merge request gitlab-org/gitlab-ce!29947
\| * \| \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs	drew cimino	2019-06-21	1	-47/+43
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-labels-in-hooks' into 'master'	Ash McKenzie	2019-06-24	3	-8/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
\| * \| \| \| \|	Added labels_hook_attrs methodfix-labels-in-hooks	Jan Provaznik	2019-06-24	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
\| * \| \| \| \|	Fix label serialisation in issue and note hooks	Sean McGivern	2019-06-20	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were not calling hook_attrs on the labels correctly. Specs were passing because the issues under test did not have any labels!
* \| \| \| \| \|	Show create merge request button on confidential issues	Phil Hughes	2019-06-24	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* \| \| \| \| \|	Merge branch 'fix-pipeline-schedule-edge-case' into 'master'	Lin Jen-Shin	2019-06-24	1	-32/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run Closes #63469 See merge request gitlab-org/gitlab-ce!29848
\| * \| \| \| \| \|	Fix pipeline schedule edge casefix-pipeline-schedule-edge-case	Shinya Maeda	2019-06-24	1	-32/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If pipeline schedule is to run at the exact same time with when cron worker runs, the pipeline schedule will not be executed at the ideal timing. We fix this bug by comparing the exact matching of ideal and cron worker's next run at.
* \| \| \| \| \| \|	Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'	Douwe Maan	2019-06-24	6	-142/+425
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
\| * \| \| \| \| \| \|	Avoid touching the MR status if MR is not opened	Oswaldo Ferreira	2019-06-21	1	-0/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only force recheck when merge-ref is outdated	Oswaldo Ferreira	2019-06-20	1	-1/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
\| * \| \| \| \| \| \|	Automatically update MR merge-ref along merge status	Oswaldo Ferreira	2019-06-20	6	-142/+358
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* \| \| \| \| \| \| \|	Fix notes email with group-level notification email	Sean McGivern	2019-06-24	4	-25/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
* \| \| \| \| \| \| \|	Merge branch 'remove_create_deployment_from_build_success_worker' into 'master'	Douwe Maan	2019-06-24	1	-44/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorker Closes #63622 See merge request gitlab-org/gitlab-ce!29958
\| * \| \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorkerremove_create_deployment_from_build_success_worker	Thong Kuah	2019-06-24	1	-44/+0
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now create_deployment on Ci::Build create. No need to call create_deployment again
* \| \| \| \| \| \| \|	Merge branch ↵	Thong Kuah	2019-06-24	2	-1/+95
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option' into 'master' Skip TeamCity trigger on branch delete and support MR triggers Closes #13871 and #17690 See merge request gitlab-org/gitlab-ce!29836
\| * \| \| \| \| \| \|	Extract common validations from ci services	Raphael Tweitmann	2019-06-21	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DroneCI and TeamCity shared the same validations methods on the data received. These validations were extracted into a concern
\| * \| \| \| \| \| \|	Skip TeamCity on branch delete and add MR trigger	Nikolay Novikov	2019-06-21	2	-0/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a take over from a community contribution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990 Skip TeamCity push event when related to branch delete Support merge request events for TeamCity service. Add checkbox for merge request triggers in the TeamCity configuration page.