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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Docs: Merge EE doc/update to CE	Marcel Amirault	2019-05-05	69	-2/+345
\|
*	Merge branch 'docs-repo-merge-4-workflow' into 'master'	Achilleas Pipinellis	2019-05-05	14	-24/+581
\|\ \| \| \| \| \| \| \| \|	Docs: Merge EE doc/workflow to CE See merge request gitlab-org/gitlab-ce!27622
\| *	Docs: Merge EE doc/workflow to CE	Marcel Amirault	2019-05-05	14	-24/+581
\|/
*	Merge branch 'docs-repo-merge-3-integration' into 'master'	Achilleas Pipinellis	2019-05-05	20	-128/+1279
\|\ \| \| \| \| \| \| \| \|	Docs: Merge EE doc/integration to CE See merge request gitlab-org/gitlab-ce!27610
\| *	Docs: Merge EE doc/integration to CE	Marcel Amirault	2019-05-05	20	-128/+1279
\|/
*	Merge branch 'docs-repo-merge-1-customization' into 'master'	Achilleas Pipinellis	2019-05-04	1	-0/+5
\|\ \| \| \| \| \| \| \| \|	Docs: Merge EE doc/customization to CE See merge request gitlab-org/gitlab-ce!27604
\| *	Docs: Merge EE doc/customization to CE	Marcel Amirault	2019-05-04	1	-0/+5
\|/
*	Merge branch '50926-sort-by-due-date-and-popularity' into 'master'	Douglas Barbosa Alexandre	2019-05-04	3	-16/+35
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Sort by due date and popularity in both directions" Closes #50926 See merge request gitlab-org/gitlab-ce!25502
\| *	Resolve "Sort by due date and popularity in both directions"	Nermin Vehabovic	2019-05-04	3	-16/+35
\|/
*	Merge branch '59365-include-time-window-parameters-in-the-url-query-string' ↵	Fatih Acet	2019-05-03	4	-27/+65
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Include time window parameters in the URL query string" Closes #59365 See merge request gitlab-org/gitlab-ce!27230
\| *	Make time window parameters available in the query string59365-include-time-window-parameters-in-the-url-query-string	Jose Vargas	2019-05-01	4	-27/+65
\| \| \| \| \| \| \| \| \| \|	This commit adds the frontend functionality to add the parameters via the `pushState` api, preventing the need for a page reload.
* \|	Merge branch 'sh-cache-rubocop-cwd' into 'master'	Douwe Maan	2019-05-03	2	-3/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache current working directory to speed up Rubocop Closes #61383 See merge request gitlab-org/gitlab-ce!28066
\| * \|	Cache current working directory to speed up Rubocopsh-cache-rubocop-cwd	Stan Hu	2019-05-03	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves thousands of getcwd() system calls and improves the performance of running Rubocop, which is also used by HAML linting. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61383
* \| \|	Merge branch '10763-track-uninstall-button-clicks-ce' into 'master'	Filipa Lacerda	2019-05-03	3	-4/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport of tracking uninstall button click See merge request gitlab-org/gitlab-ce!28012
\| * \| \|	CE-backport track uninstall button clicks10763-track-uninstall-button-clicks-ce	Enrique Alcantara	2019-05-02	3	-4/+26
\| \| \| \|
* \| \| \|	Merge branch 'patch-37' into 'master'	Bob Van Landuyt	2019-05-03	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add @katrinleinweber as German proofreader See merge request gitlab-org/gitlab-ce!24331
\| * \| \| \|	Add @katrinleinweber as German proofreader	Katrin Leinweber	2019-01-11	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-56838-allow-guest-access-to-releases' into 'master'	Marcia Ramos	2019-05-03	1	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Releases permissions docs See merge request gitlab-org/gitlab-ce!27935
\| * \| \| \| \|	Update Releases permissions docs	Krasimir Angelov	2019-05-03	1	-2/+6
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guest users now can read releases, except for items related to source code. Releated: https://gitlab.com/gitlab-org/gitlab-ce/issues/56838 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27247
* \| \| \| \|	Merge branch '59952' into 'master'	Kushal Pandya	2019-05-03	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set timezone as GMT in Jest config file Closes #59952 See merge request gitlab-org/gitlab-ce!27738
\| * \| \| \| \|	Set timezone to GMT in Jest config59952	Fatih Acet	2019-05-02	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '56838-allow-guest-access-to-releases' into 'master'	Lin Jen-Shin	2019-05-03	18	-38/+162
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow guests users to access project releases Closes #56838 See merge request gitlab-org/gitlab-ce!27247
\| * \| \| \| \| \|	Allow guests users to access project releases	Krasimir Angelov	2019-05-03	18	-38/+162
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is step one of resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/56838. Here is what changed: - Revert the security fix from bdee9e8412d. - Do not leak repository information (tag name, commit) to guests in API responses. - Do not include links to source code in API responses for users that do not have download_code access. - Show Releases in sidebar for guests. - Do not display links to source code under Assets for users that do not have download_code access. GET ':id/releases/:tag_name' still do not allow guests to access releases. This is to prevent guessing tag existence.
* \| \| \| \| \|	Merge branch '46806-typed-ci-variables-docs' into 'master'	Marcia Ramos	2019-05-03	8	-27/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update docs related to CI variables See merge request gitlab-org/gitlab-ce!27786
\| * \| \| \| \| \|	Update docs related to CI variables	Krasimir Angelov	2019-05-03	8	-27/+42
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Variable Types` section to explain supported variable types and update example and related screenshots.
* \| \| \| \| \|	Merge branch 'include-all-postgres-queries-in-performance-bar-summary' into ↵	Stan Hu	2019-05-03	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include all queries in the performance bar summary Closes #61372 See merge request gitlab-org/gitlab-ce!28063
\| * \| \| \| \| \|	Include all queries in the performance bar summary	Sean McGivern	2019-05-03	1	-0/+12
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5.1's `exec_no_cache` doesn't call `async_exec` any more, but `exec_params`: https://github.com/rails/rails/pull/33188 This means that the DB summary in the performance bar was wrong. The individual query details were still correct (we subscribe to ActiveRecord events for those). We can remove this once the upstream PR to peek-pg is in a release and we update to use that release.
* \| \| \| \| \|	Merge branch 'js-i18n-reports' into 'master'	Tim Zallmann	2019-05-03	2	-3/+9
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of reports directory See merge request gitlab-org/gitlab-ce!27742
\| * \| \| \| \|	Internationalisation of reports directory	Brandon Labuschagne	2019-05-03	2	-3/+9
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \| \|	Merge branch 'ee-10030-excluded-paths' into 'master'	Bob Van Landuyt	2019-05-03	2	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass excluded paths to SAST and DS See merge request gitlab-org/gitlab-ce!28018
\| * \| \| \| \|	Propagate excluded paths to SAST & DS jobs	Fabien Catteau	2019-05-03	2	-0/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Propagate DS_EXCLUDED_PATHS to dependency_scanning job, and SAST_EXCLUDED_PATHS and SAST_BANDIT_EXCLUDED_PATHS to sast job. This makes possible to excluded certains paths from SAST reports and Dependency Scanning reports, respectively.
* \| \| \| \|	Merge branch 'expand-diff-performance' into 'master'	Filipa Lacerda	2019-05-03	14	-97/+379
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Impove the performance of expanding full diff Closes #58597 See merge request gitlab-org/gitlab-ce!27413
\| * \| \| \| \|	Impove the performance of expanding full diff	Phil Hughes	2019-05-03	14	-97/+379
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
* \| \| \| \| \|	Merge branch 'docs/sort-ci-features-by-stage' into 'master'	Achilleas Pipinellis	2019-05-03	1	-20/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort feature set table by stage See merge request gitlab-org/gitlab-ce!27940
\| * \| \| \| \| \|	Sort feature set table by stage	Evan Read	2019-05-03	1	-20/+30
\|/ / / / / /
* \| \| \| \| \|	Merge branch '61365-consider-setting-rspec-full_backtrace-only-in-ci' into ↵	Stan Hu	2019-05-03	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Consider setting RSpec `full_backtrace` only in CI" Closes #61365 See merge request gitlab-org/gitlab-ce!28051
\| * \| \| \| \| \|	Show full Rspec backtrace only in CI	Heinrich Lee Yu	2019-05-03	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'js-i18n-javascript-s-directories' into 'master'	Filipa Lacerda	2019-05-03	4	-5/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of javascript/s* directories See merge request gitlab-org/gitlab-ce!27745
\| * \| \| \| \| \| \|	Internationalisation of javascript/s* directories	Brandon Labuschagne	2019-05-03	4	-5/+20
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-05-03	3	-38/+103
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ce' into 'master' EE Backport to CE of EE!11151 See merge request gitlab-org/gitlab-ce!27824
\| * \| \| \| \| \|	EE Backport to CE of Note Form EE Diffs9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ce	Sam Bigelow	2019-05-02	3	-38/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves all EE Specific lines into the ee directory CE Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11151/commits?view=parallel
* \| \| \| \| \| \|	Merge branch '18432-switch-to-sassc-rails' into 'master'	Stan Hu	2019-05-03	3	-10/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to sassc-rails for faster stylesheet compilation Closes #18432 See merge request gitlab-org/gitlab-ce!26224
\| * \| \| \| \| \| \|	Switch to sassc-rails for faster stylesheet compilation18432-switch-to-sassc-rails	Gabriel Mazetto	2019-04-27	3	-10/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-20' into 'master'	Evan Read	2019-05-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[docs] Clarify gitlab.rb settings for modifying pipeline schedule worker See merge request gitlab-org/gitlab-ce!27725
\| * \| \| \| \| \| \| \|	Clarify gitlab.rb settings for modifying pipeline schedule worker	Zac Sturgess	2019-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-whitelist-internal-api' into 'master'	Stan Hu	2019-05-03	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whitelist query limits for internal API Closes gitlab-ee#11450 See merge request gitlab-org/gitlab-ce!28037
\| * \| \| \| \| \| \| \| \|	Whitelist query limits for internal API	Stan Hu	2019-05-03	2	-1/+5
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When creating a merge request for push options, there may be over 100 queries that are run to create a merge request. Even after we reduce the number of queries by disabling the Sidekiq jobs, it appears we still hover near this limit. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11450
* \| \| \| \| \| \| \| \|	Merge branch 'docs/modify-versions-guidance' into 'master'	Mike Lewis	2019-05-03	1	-18/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust how we do version text in docs See merge request gitlab-org/gitlab-ce!22894
\| * \| \| \| \| \| \| \| \|	Final review feedback applieddocs/modify-versions-guidance	Evan Read	2019-05-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adjust guidance based on feedback	Evan Read	2019-05-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \|