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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Uniform html and text emails58065-uniform-html-txt-email	Frank van Rest	2019-06-21	9	-85/+59
\| \| \| \| \| \|	Uniform new_issue_email html and text emails Uniform note_email html and text emails Uniform new_merge_request_email html and text emails
*	Merge branch 'link_to_issue_statistics_api_endpoint_in_docs' into 'master'	Achilleas Pipinellis	2019-06-20	1	-0/+3
\|\ \| \| \| \| \| \| \| \|	Docs: Link issue statistics api endpoint in the docs See merge request gitlab-org/gitlab-ce!29855
\| *	Link issue statistics api endpoint in the docslink_to_issue_statistics_api_endpoint_in_docs	Alexandru Croitor	2019-06-20	1	-0/+3
\| \| \| \| \| \| \| \|	Adds the missing link to issues_statistics api endpoint
* \|	Merge branch 'docs-update-container-registry-api' into 'master'	Achilleas Pipinellis	2019-06-20	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Docs for Container Registry API Delete Endpoints See merge request gitlab-org/gitlab-ce!29709
\| * \|	Update Docs for Container Registry API Delete Endpoints	Jason Goodman	2019-06-20	1	-0/+5
\|/ /
* \|	Merge branch 'docs/existing-knative-edit' into 'master'	Achilleas Pipinellis	2019-06-20	1	-4/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add version text and edit section See merge request gitlab-org/gitlab-ce!29875
\| * \|	Add version text and edit section	Evan Read	2019-06-20	1	-4/+14
\|/ /
* \|	Merge branch 'docs/edit-zoom-call-link-content' into 'master'	Achilleas Pipinellis	2019-06-20	1	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Edit new Zoom call link content See merge request gitlab-org/gitlab-ce!29878
\| * \|	Edit new Zoom call link content	Evan Read	2019-06-20	1	-2/+9
\|/ /
* \|	Merge branch 'graphql-file-renames' into 'master'	Kushal Pandya	2019-06-20	11	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rename graphql files to match frontend docs See merge request gitlab-org/gitlab-ce!29856
\| * \|	Rename graphql files to match frontend docs	Phil Hughes	2019-06-19	11	-6/+6
\| \| \|
* \| \|	Merge branch 'docs-registry-restore-workaround' into 'master'	Achilleas Pipinellis	2019-06-20	1	-0/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation update for registry restore troubleshooting Closes #63163 See merge request gitlab-org/gitlab-ce!29819
\| * \| \|	Document the workaround for issues after registry restore	DJ Mountney	2019-06-20	1	-0/+31
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restoring the registry ends up using the wrong file permissions, breaking the registry. Document the workaround while we look at improvements.
* \| \|	Merge branch 'sh-remove-import-columns-from-projects' into 'master'	Douwe Maan	2019-06-20	5	-8/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove import columns from projects table See merge request gitlab-org/gitlab-ce!29863
\| * \| \|	Remove import columns from projects tablesh-remove-import-columns-from-projects	Stan Hu	2019-06-19	5	-8/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21497, we migrated all project import data into a separate table, `project_import_data`. In addition, we also added: ``` ignore_column :import_status, :import_jid, :import_error ``` In https://gitlab.com/gitlab-com/gl-infra/production/issues/908, we observed some of these `import_error` columns consumed megabytes of error backtraces and caused slow loading of projects whenever a `SELECT * from projects` query loaded the row into memory. Since we have long migrated away from these columns, we can now drop these columns entirely.
* \| \| \|	Merge branch 'bvl-markdown-graphql' into 'master'	Douwe Maan	2019-06-20	19	-19/+207
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render markdown in GraphQL See merge request gitlab-org/gitlab-ce!29700
\| * \| \| \|	Render GFM html in GraphQL	Bob Van Landuyt	2019-06-20	19	-19/+207
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a `markdown_field` to our types. Using this helper will render a model's markdown field using the existing `MarkupHelper` with the context of the GraphQL query available to the helper. Having the context available to the helper is needed for redacting links to resources that the current user is not allowed to see. Because rendering the HTML can cause queries, the complexity of a these fields is raised by 5 above the default. The markdown field helper can be used as follows: ``` markdown_field :note_html, null: false ``` This would generate a field that will render the markdown field `note` of the model. This could be overridden by adding the `method:` argument. Passing a symbol for the method name: ``` markdown_field :body_html, null: false, method: :note ``` It will have this description by default: > The GitLab Flavored Markdown rendering of `note` This could be overridden by passing a `description:` argument. The type of a `markdown_field` is always `GraphQL::STRING_TYPE`.
* \| \| \|	Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master'	Stan Hu	2019-06-20	2	-6/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix(favicon): get favicon_path, so it works also with uploads object store See merge request gitlab-org/gitlab-ce!29482
\| * \| \| \|	fix(favicon): get favicon_path, so it works also with uploads object store	Roger Meier	2019-06-14	2	-6/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'expose-saml-provider-id-to-users-api' into 'master'	Stan Hu	2019-06-19	5	-25/+37
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating CE repo to include new EE users API changes See merge request gitlab-org/gitlab-ce!29581
\| * \| \| \|	Updating CE repo to include new EE users API changes	Michael Leopard	2019-06-19	5	-25/+37
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated users API documentation Moved API level changes to the service level
* \| \| \|	Merge branch 'docs-gitaly-without-nfs' into 'master'	Mike Lewis	2019-06-19	1	-0/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitaly docs to enumerate how to eliminate NFS altogether See merge request gitlab-org/gitlab-ce!29812
\| * \| \| \|	Minor edits to Eliminating NFS section	Mike Lewis	2019-06-19	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	Prefer cd path over ee path in docs linksdocs-gitaly-without-nfs	Diana Stanley	2019-06-18	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Modify to conform to style guide	Diana Stanley	2019-06-18	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Update gitaly docs to enumerate how to eliminate NFS altogether	Diana Stanley	2019-06-18	1	-0/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-jobs-controller-index-n-1' into 'master'	Stan Hu	2019-06-19	4	-5/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 problem in `JobsController#index` See merge request gitlab-org/gitlab-ce!29839
\| * \| \| \| \|	Fix N+1 problem in `JobsController#index`fix-jobs-controller-index-n-1	Kamil Trzciński	2019-06-19	4	-5/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds missing preloads, and introduces additional n+1 matcher to look for duplicates.
* \| \| \| \| \|	Merge branch '9490-static-gitattributes-for-design-repos-ce' into 'master'	Mayra Cabrera	2019-06-19	3	-7/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for changes in EE MR 14017 See merge request gitlab-org/gitlab-ce!29328
\| * \| \| \| \| \|	CE backport for changes in EE MR 14017	Luke Duncalfe	2019-06-19	3	-7/+24
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports to CE changes to allow the EE model DesignManagement::Repository to override the #attributes_at method to provide its own git attributes. The #attributes_at method was freely available, as it's never called by anything in the app. It looks like the code that called it got refactored out of existence in ca66a04f. It was still being called in a spec https://gitlab.com/gitlab-org/gitlab-ce/blob/85b29c1c2fa3b94d7371cf454c485457a0756cb1/spec/services/files/create_service_spec.rb#L40 which I've left because with the change in Lfs::FileTransformer in fact is now again the perfect test! See EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017 And these comment threads https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984
* \| \| \| \| \|	Merge branch '63227-fix-double-border' into 'master'	Annabel Dunstone Gray	2019-06-19	3	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Double Border in Profile Page Closes #63227 See merge request gitlab-org/gitlab-ce!29784
\| * \| \| \| \| \|	Fix double border in profile page	Yoginth	2019-06-19	3	-2/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'nested-lists-margin-fix' into 'master'	Annabel Dunstone Gray	2019-06-19	2	-0/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix nested lists unnecessary margin Closes #33744 See merge request gitlab-org/gitlab-ce!29775
\| * \| \| \| \| \|	Remove unnecessary margin in markdown nested lists	Kuba Kopeć	2019-06-19	2	-0/+10
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'test-script-watch' into 'master'	Mike Greiling	2019-06-19	1	-7/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add watch option to test script See merge request gitlab-org/gitlab-ce!29560
\| * \| \| \| \| \|	Add watch option to test script	Paul Gascou-Vaillancourt	2019-06-19	1	-7/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'pderichs-52123' into 'master'	Robert Speicher	2019-06-19	7	-31/+71
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use NotesFinder to get Noteable See merge request gitlab-org/gitlab-ce!28205
\| * \| \| \| \| \|	Simplify result of find_noteablepderichs-52123	Patrick Derichs	2019-06-19	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove unneeded parentheses	Patrick Derichs	2019-06-19	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Separate conditions to increase readability	Patrick Derichs	2019-06-19	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use NotesFinder to fetch notes on API and Controllers	Patrick Derichs	2019-06-19	7	-30/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing iid query on NotesFinder Changed parameters of find_noteable, so changes across a few files were needed. MergeRequest also requires iid instead of id query Make NotesFinder fail with RecordNotFound again Add specs for target_iid Using RSpec tablesyntax for target_iid specs Revert "Using RSpec tablesyntax for target_iid specs" This reverts commit ba45c7f569a. Allow find_by! here Fix variable name Add readable check Revert "Add readable check" This reverts commit 9e3a1a7aa39. Remove unnecessary assignment Add required changes for EE Fix parameter count Reduce code duplication by extracting a noteable module method The call to find_noteable was redundant so multiple files and lines have changed in that commit to use the newly introduced module method `noteable`. Replace casecmp with include check Add parent_type parameter Revert "Reduce code duplication by extracting a noteable module method" This reverts commit 8c0923babff16. Method is no longer needed Check whether noteable can be read by user
* \| \| \| \| \| \|	Merge branch 'fe-vue-test-utils-for-tooltip-on-truncate-spec' into 'master'	Mike Greiling	2019-06-19	1	-82/+98
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use @vue/test-utils for tooltip_on_truncate_spec See merge request gitlab-org/gitlab-ce!29249
\| * \| \| \| \| \| \|	Use @vue/test-utils for tooltip_on_truncate_specfe-vue-test-utils-for-tooltip-on-truncate-spec	Paul Slaughter	2019-06-17	1	-82/+98
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '52442-minimal-remove-mysql-support' into 'master'	Robert Speicher	2019-06-19	20	-531/+30
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only support postgresql (minimal version) See merge request gitlab-org/gitlab-ce!29790
\| * \| \| \| \| \| \| \|	Update the docs to reflect lack of MySQL support52442-minimal-remove-mysql-support	Nick Thomas	2019-06-19	16	-461/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now MySQL is no longer supported, we need to change the docs
\| * \| \| \| \| \| \| \|	Only support postgresql	Nick Thomas	2019-06-19	4	-70/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MySQL support has been removed
* \| \| \| \| \| \| \| \|	Merge branch 'api-js-forked-projects' into 'master'	Filipa Lacerda	2019-06-19	2	-0/+39
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added forked projects API call function See merge request gitlab-org/gitlab-ce!29841
\| * \| \| \| \| \| \| \| \|	Added forked projects API call function	Phil Hughes	2019-06-19	2	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* \| \| \| \| \| \| \| \| \|	Merge branch 'pj/fix-emacs-style' into 'master'	Lin Jen-Shin	2019-06-19	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax coloring on emacs See merge request gitlab-org/gitlab-ce!29844
\| * \| \| \| \| \| \| \| \| \|	Use correct arg name	pjaspers	2019-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So funny story, true story. I tried to run the test locally, but didn't make it past setting up Gitaly. Here's what I tried: First attempt: `git clone gitlab-ce` `cd gitlab-ce && bundle install` `be rspec` This didn't work because I was missing the config/database.yml, I didn't see a `script/bootstrap` so I looked in the readme which redirected me to a webpage which redirected me to the gitlab-development-kit. Second attempt: `gem install gitlab-development-kit` cd gitlab-development-kit gdk init gdk isntall This broke somwhere along the way because it couldn't install Gitaly because my go version was too low. But it did clone the gitlab repo again and this time it did have a config/database.yml. So I tried to cd into it and `be rspec spec/lib/gitlab/database/migration_helpers_spec.rb` which complained about the database not being configured so I: - Changed the socket to localhost (in the config/database.yml) - `createdb <dev_db>` `createdb test_db` - `be rake db:test:prepare` Great success, it was doing things! But then failed when it came at the Gitaly step. Since I only want to change these three lines, at the point I gave up and entrusted the pipeline to do its thing. What I would have liked: - A 'It's a Rails system, I know this' readme/docs (It's in there somewhere just couldn't find it) - A way to run tests without having to use Gitaly - Not having too install all the things for a small fix (I get why'd you want this, but to me it's overkill)