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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow to include files from another projectsinclude-project	Kamil Trzciński	2019-01-04	22	-41/+316
\| \| \| \|	This adds `project:, file:, ref:` specification support.
*	Merge branch 'include-templates' into 'master'	Kamil Trzciński	2019-01-04	16	-65/+468
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Include templates Closes #53445 See merge request gitlab-org/gitlab-ce!23495
\| *	Allow to include templates	Kamil Trzciński	2019-01-04	16	-65/+468
\| \| \| \| \| \| \| \| \| \|	This rewrites a syntax to allow include of templates. This also normalises the syntax used by include: feature
* \|	Merge branch 'bvl-dont-ignore-gitlab-pot-compat-check' into 'master'	Yorick Peterse	2019-01-04	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't ingore the `gitlab.pot` in ee_compat_check See merge request gitlab-org/gitlab-ce!24151
\| * \|	Don't ingore the `gitlab.pot` in ee_compat_check	Bob Van Landuyt	2019-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there are new strings in CE, they need to be added to EE manually. As the `locale/gitlab.pot` file can't be merged automatically during the upstream merge.
* \| \|	Merge branch 'contacted_at' into 'master'	Stan Hu	2019-01-04	5	-2/+62
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guarantee visually correct order of runners on the "Admin Area > Runners" page Closes #49791 See merge request gitlab-org/gitlab-ce!21627
\| * \| \|	Take contacted_at value from the DB when it is about to be displayed in the ↵	Alexander Kutelev	2019-01-04	5	-2/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Web interface with sorting enabled.
* \| \| \|	Merge branch 'docs-releases-api' into 'master'	Marcia Ramos	2019-01-04	5	-10/+545
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for Release page MVC Closes #41766 See merge request gitlab-org/gitlab-ce!23901
\| * \| \| \|	Documentation for Release page MVC	Filipa Lacerda - 🎄🎄 OOO - Back on January 7th - 🎄🎄	2019-01-04	5	-10/+545
\|/ / / /
* \| \| \|	Merge branch 'ac-releases-api-with-assets' into 'master'	Kamil Trzciński	2019-01-04	19	-4/+447
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Support asset links creation in `POST /projects/:id/release` See merge request gitlab-org/gitlab-ce!24056
\| * \| \|	Change release links table ID to bigserialac-releases-api-with-assets	Shinya Maeda	2019-01-04	2	-2/+2
\| \| \| \|
\| * \| \|	Use AR releation "count" method	Shinya Maeda	2019-01-04	1	-1/+1
\| \| \| \|
\| * \| \|	Add sequence to release link factory	Shinya Maeda	2019-01-04	1	-2/+2
\| \| \| \|
\| * \| \|	Add frozen_string_literal: true	Shinya Maeda	2019-01-04	3	-0/+6
\| \| \| \|
\| * \| \|	Add unique constraint to release and url	Shinya Maeda	2019-01-04	8	-110/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix coding style Improve coding style Decouple UPDATE and DELETE operations of asset links Rename links_attributes to assets:links Rename exposed param and updated spec
\| * \| \|	Add spec for duplicate link name creation	Shinya Maeda	2019-01-04	2	-23/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec for mysql unique validation failure
\| * \| \|	Add spec for Releases::Source and Link models	Shinya Maeda	2019-01-04	6	-3/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Releases::Source and Releases::Link are covered by tests
\| * \| \|	Update safe model attributes for import/export	Shinya Maeda	2019-01-04	1	-0/+7
\| \| \| \|
\| * \| \|	Support CURD operation for release asset links	Shinya Maeda	2019-01-04	15	-3/+371
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add Releases::Links model - Expose it in release API - Add integration tests
* \| \| \|	Merge branch 'link-new-openshift-template' into 'master'	Achilleas Pipinellis	2019-01-04	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark references to openshift template as deprecated See merge request gitlab-org/gitlab-ce!24092
\| * \| \| \|	Mark references to openshift template as deprecated	Balasankar "Balu" C	2019-01-04	1	-0/+6
\|/ / / /
* \| \| \|	Merge branch 'leipert-forward-gitlab-svgs' into 'master'	Clement Ho	2019-01-04	2	-5/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Update @gitlab/svgs to latest version See merge request gitlab-org/gitlab-ce!24148
\| * \| \|	Update @gitlab/svgs to latest version	Lukas Eipert	2019-01-04	2	-5/+5
\| \| \| \|
* \| \| \|	Merge branch '55853-deprecate-ci-autodeploy-quick_start_guide-html-docs' ↵	Achilleas Pipinellis	2019-01-04	8	-95/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Deprecate Auto Deploy's quick start guide Closes #55853 See merge request gitlab-org/gitlab-ce!24096
\| * \| \| \|	Deprecate Auto Deploy's quick start guide55853-deprecate-ci-autodeploy-quick_start_guide-html-docs	Takuya Noguchi	2019-01-02	8	-95/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \|	Merge branch 'mj/process-feature-freeze' into 'master'	Yorick Peterse	2019-01-04	1	-4/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Green pipeline for feature freeze PROCESS See merge request gitlab-org/gitlab-ce!23809
\| * \| \| \| \|	Change the wording on branch feature freezemj/process-feature-freeze	Marin Jankovski	2018-12-14	1	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Green pipeline for feature freeze PROCESS	Marin Jankovski	2018-12-13	1	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ab-50763-persist-index' into 'master'	Yorick Peterse	2019-01-04	4	-3/+60
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specific CI indexes to avoid statement timeout. Closes #50763 See merge request gitlab-org/gitlab-ce!23188
\| * \| \| \| \|	Add specific index namesab-50763-persist-index	Andreas Brandl	2019-01-03	2	-6/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful to distinguish any other indexes on the same columns but with different conditions and/or sorting.
\| * \| \| \| \|	Add specific indexes for CI	Andreas Brandl	2019-01-03	3	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds specific indexes to speed up the query mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/50763 and to avoid statement timeouts. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50763.
\| * \| \| \| \|	Add support for explicit index order	Andreas Brandl	2019-01-03	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord supports `:order` natively, but it is skipped because of our specific patch to support opclasses. Relevant AR code: https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L1167
* \| \| \| \| \|	Merge branch 'ee1979-gl-modal-vuex' into 'master'	Kushal Pandya	2019-01-04	9	-0/+353
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create shared gl-modal-vuex component and module See merge request gitlab-org/gitlab-ce!24140
\| * \| \| \| \| \|	Create shared gl-modal-vuex component and moduleee1979-gl-modal-vuex	Paul Slaughter	2019-01-03	9	-0/+353
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? It is significantly easier to manage the visibility of the modal in Vuex. The module contains the state and mutations to manage this. The component wraps GlModal and syncs the visibility with the module.
* \| \| \| \| \| \|	Merge branch '43623-add-submit-feedback-in-product-feedback-link' into 'master'	Kushal Pandya	2019-01-04	3	-0/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add "Submit feedback" in-product feedback link" Closes #43623 See merge request gitlab-org/gitlab-ce!23547
\| * \| \| \| \| \| \|	Add submit feedback link to help dropdown43623-add-submit-feedback-in-product-feedback-link	Brandon Labuschagne	2019-01-04	3	-0/+11
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '53696-make-rbac-default' into 'master'	Kamil Trzciński	2019-01-04	18	-113/+95
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make RBAC enabled by default for new clusters Closes #53696 See merge request gitlab-org/gitlab-ce!24119
\| * \| \| \| \| \| \|	Make RBAC enabled default for new clusters	Dylan Griffith	2019-01-04	18	-113/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many changes were also made to tests that expected this to default to false.
* \| \| \| \| \| \| \|	Merge branch 'tz-make-user-popover-spec-more-consistent' into 'master'	Kushal Pandya	2019-01-04	1	-6/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made user_popovers_spec more stable See merge request gitlab-org/gitlab-ce!24145
\| * \| \| \| \| \| \| \|	Made user_popovers_spec more stable on the value sidetz-make-user-popover-spec-more-consistent	Tim Zallmann	2019-01-04	1	-6/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ce-revert-revert-gold-trial-mrs' into 'master'	Kamil Trzciński	2019-01-04	23	-57/+140
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring back reverted Gold Trial MR (CE backport) See merge request gitlab-org/gitlab-ce!23621
\| * \| \| \| \| \| \| \| \|	Port GitLab.com gold trial callout changes to CEce-revert-revert-gold-trial-mrs	Luke Bennett	2019-01-03	23	-57/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
* \| \| \| \| \| \| \| \| \|	Merge branch 'use-cheap-operation-for-ci-pipeline-all_merge_requests' into ↵	Kamil Trzciński	2019-01-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Use cheap operation for `Ci::Pipeline#all_merge_requests` Closes #54907 See merge request gitlab-org/gitlab-ce!24115
\| * \| \| \| \| \| \| \| \| \|	Use cheap operation for `Ci::Pipeline#all_merge_requests`use-cheap-operation-for-ci-pipeline-all_merge_requests	Shinya Maeda	2019-01-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-a-comment-on-ci-pipeline-git_ref-about-merge-request-ref' ↵	Kamil Trzciński	2019-01-04	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add a comment on `Ci::Pipeline#git_ref` about merge request ref Closes #54908 See merge request gitlab-org/gitlab-ce!24114
\| * \| \| \| \| \| \| \| \| \|	Add a comment on `Ci::Pipeline#git_ref` about merge request refadd-a-comment-on-ci-pipeline-git_ref-about-merge-request-ref	Shinya Maeda	2019-01-03	1	-0/+6
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-skip-validation-visibility-changed' into 'master'	Douwe Maan	2019-01-04	3	-2/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only validate project visibility when it has changed Closes #55881 See merge request gitlab-org/gitlab-ce!24142
\| * \| \| \| \| \| \| \| \| \|	Only validate project visibility when it has changedsh-skip-validation-visibility-changed	Stan Hu	2019-01-03	3	-2/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On GitLab.com, there are hundreds of projects that have visibility levels that are inconsistent with the fork or group settings. Most likely, this happened during a GitLab project import because the validation was bypassed. Attempting to migrate these projects to hashed storage fails even though the migration doesn't touch the visibility settings. Skipping the visibility validation allows the migration to go through. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55881
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2019-01-04	6	-43/+141
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo' into 'master' Configure Auto DevOps deployed applications with secrets from prefixed CI variables See merge request gitlab-org/gitlab-ce!23719
\| * \| \| \| \| \| \| \| \| \| \|	QA spec for Auto DevOps application secrets49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo	Thong Kuah	2019-01-04	2	-31/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We assert that a K8S_SECRET_* variable is ingestible by our Rack application Re-use project and cluster resources in Auto DevOps QA