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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed extra assertion in spec66331-html-code-shown-in-merge-request	Ezekiel Kigbo	2019-08-21	1	-4/+0
\|
*	Added changelog entry	Ezekiel Kigbo	2019-08-21	1	-0/+5
\|
*	Fix double escaped html	Ezekiel Kigbo	2019-08-21	2	-0/+23
\|
*	Merge branch 'master' into 'master'	Paul Slaughter	2019-08-20	3	-5/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove margin from user header buttons Closes #57966 See merge request gitlab-org/gitlab-ce!30878
\| *	Remove margin from user header buttons	Lucy Fox	2019-08-20	3	-5/+9
\|/
*	Merge branch '66066-dark-theme-style-for-expansion-on-mr-diffs' into 'master'	Mike Greiling	2019-08-20	9	-21/+42
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Match syntax highlighting theme for line expansion rows Closes #66066 See merge request gitlab-org/gitlab-ce!31821
\| *	Add syntax highlighting for line expansion	Samantha Ming	2019-08-20	9	-21/+42
\|/ \| \| \| \| \| \| \| \|	- dark - white - monokai - none - solarized-dark - solarized-light
*	Merge branch 'ci-config-on-policy' into 'master'	Kamil Trzciński	2019-08-20	22	-43/+1406
\|\ \| \| \| \| \| \| \| \|	Flexible Rules for CI Build config See merge request gitlab-org/gitlab-ce!29011
\| *	Introducing new Syntax for Ci::Build inclusion rules	drew	2019-08-20	22	-43/+1406
\|/ \| \| \| \| \| \| \|	- Added Gitlab::Ci::Config::Entry::Rules and Gitlab::Ci::Config::Entry::Rules:Rule to handle lists of Rule objects to be evalauted for job inclusion - Added `if:` and `changes:` as available Rules::Rule::Clause classes - Added Rules handling logic to Seed::Build#included? with extra specs - Use DisallowedKeysValidator to mutually exclude rules: from only:/except: on job config
*	Merge branch 'shell-9-4-1' into 'master'	Douwe Maan	2019-08-20	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Use gitlab-shell v9.4.1 See merge request gitlab-org/gitlab-ce!32022
\| *	Use gitlab-shell v9.4.1	Douwe Maan	2019-08-20	1	-1/+1
\| \|
* \|	Merge branch 'update-babel-to-7.5.5' into 'master'	Mike Greiling	2019-08-20	3	-22/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade babel to 7.5.5 See merge request gitlab-org/gitlab-ce!31819
\| * \|	Upgrade babel to 7.5.5update-babel-to-7.5.5	Takuya Noguchi	2019-08-14	3	-22/+27
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \|	Merge branch 'ssh-add-no-redirect' into 'master'	Achilleas Pipinellis	2019-08-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In ssh_keys docs, don't redirect stdout of ssh-add See merge request gitlab-org/gitlab-ce!31630
\| * \| \|	Remove inoperative >/dev/null	Alexander Oleynikov	2019-08-08	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-repository-languages-img' into 'master'	Achilleas Pipinellis	2019-08-20	3	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update repository languages screenshot See merge request gitlab-org/gitlab-ce!31925
\| * \| \| \|	Update repository languages screenshot	Marcel Amirault	2019-08-20	3	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'winh-fix-mocks_helper_spec' into 'master'	Mike Greiling	2019-08-20	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix assertion in mocks_helper_spec.js See merge request gitlab-org/gitlab-ce!32005
\| * \| \| \|	Fix assertion in mocks_helper_spec.js	Winnie Hellmann	2019-08-20	1	-1/+3
\|/ / / /
* \| \| \|	Merge branch 'sh-standardize-log-names' into 'master'	Mayra Cabrera	2019-08-20	10	-20/+36
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize remote_ip and path keys for auth.log and api_json.log Closes #66167 See merge request gitlab-org/gitlab-ce!31921
\| * \| \|	Standardize remote_ip and path keys for auth.log and api_json.log	Stan Hu	2019-08-20	10	-20/+36
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses `remote_ip` and `path` for the same fields. Let's standardize these namings to make it easier for people working with the data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167
* \| \|	Merge branch 'docs/rename-geo-pages' into 'master'	Achilleas Pipinellis	2019-08-20	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Harmonizes titles between two Geo landing pages See merge request gitlab-org/gitlab-ce!31944
\| * \| \|	Harmonizes titles between two Geo landing pages	Evan Read	2019-08-20	2	-3/+3
\|/ / / \| \| \| \| \| \| \| \| \|	Menu entries in global navigation will be updated to match.
* \| \|	Merge branch 'docs-integration-screenshots' into 'master'	Achilleas Pipinellis	2019-08-20	3	-7/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update project import screenshot Closes #28826 See merge request gitlab-org/gitlab-ce!31946
\| * \| \|	Update project import doc	Marcel Amirault	2019-08-20	3	-7/+7
\|/ / / \| \| \| \| \| \| \| \| \|	Update screenshot and improve text to match
* \| \|	Merge branch 'docs/clarify-new-values' into 'master'	Achilleas Pipinellis	2019-08-20	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951
\| * \| \|	Clarify when new values are valid	Evan Read	2019-08-20	1	-2/+5
\|/ / /
* \| \|	Merge branch '10943-css-clean-up-ee' into 'master'	Annabel Dunstone Gray	2019-08-20	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a height utility class See merge request gitlab-org/gitlab-ce!32019
\| * \| \|	Adds a height utility class10943-css-clean-up-ee	Filipa Lacerda	2019-08-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports EE changes
* \| \| \|	Merge branch 'da/enable-dast-using-template' into 'master'	Rémy Coutable	2019-08-20	1	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable DAST See merge request gitlab-org/gitlab-ce!31970
\| * \| \| \|	Enable DAST	Dennis Appelt	2019-08-20	1	-0/+10
\|/ / / /
* \| \| \|	Merge branch 'remove-unused-security-fixtures' into 'master'	Lin Jen-Shin	2019-08-20	18	-4417/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused security fixtures Closes #62734 See merge request gitlab-org/gitlab-ce!31557
\| * \| \| \|	Removed security fixtures as they are ee onlyremove-unused-security-fixtures	Cameron Swords	2019-08-20	19	-5364/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These will be moved to the EE codebase.
* \| \| \| \|	Merge branch 'bvl-mr-commit-note-counter' into 'master'	Douwe Maan	2019-08-20	4	-14/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Count notes for commits and merge requests See merge request gitlab-org/gitlab-ce!31912
\| * \| \| \| \|	Count comments on notes and merge requests	Bob Van Landuyt	2019-08-16	4	-14/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This extends our existing `Gitlab::UsageDataCounters::NoteCounter` to also count notes on commits and merge requests
* \| \| \| \| \|	Merge branch 'fix-deprecation-warnings-change-success-to-successful' into ↵	Douglas Barbosa Alexandre	2019-08-20	20	-54/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Change `be_success` to `be_successful` in specs See merge request gitlab-org/gitlab-ce!31969
\| * \| \| \| \| \|	Change `be_success` to `be_successful` in specsfix-deprecation-warnings-change-success-to-successful	Vitali Tatarintev	2019-08-19	20	-54/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes deprecation warning: ``` DEPRECATION WARNING: The success? predicate is deprecated and will be removed in Rails 6.0. Please use successful? as provided by Rack::Response::Helpers. ```
* \| \| \| \| \| \|	Merge branch 'rf-remove-gl-sast-report-json' into 'master'	Yorick Peterse	2019-08-20	1	-861/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove file that was accidentally added back See merge request gitlab-org/gitlab-ce!32014
\| * \| \| \| \| \| \|	Remove file that was accidentally added back	rossfuhrman	2019-08-20	1	-861/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file was moved to the EE project namespace, but https://gitlab.com/gitlab-org/gitlab-ce/commit/ce50d5c45158723925b098f7e0033963841137ff brought it back. It should not be present in this repo.
* \| \| \| \| \| \|	Merge branch 'pb-update-gitlab-shell-9-4-0' into 'master'	Nick Thomas	2019-08-20	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to GitLab Shell v9.4.0 See merge request gitlab-org/gitlab-ce!32009
\| * \| \| \| \| \| \|	Update to GitLab Shell v9.4.0	Patrick Bajao	2019-08-20	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-08-20	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62373-badge-counter-very-low-contrast-between-foreground-and-background-colors-2' into 'master' Resolve "Badge counter: Very low contrast between foreground and background colors" Closes #62373 See merge request gitlab-org/gitlab-ce!31922
\| * \| \| \| \| \| \| \|	Resolve "Badge counter: Very low contrast between foreground and background ↵	Jeremy Elder	2019-08-20	2	-1/+7
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	colors"
* \| \| \| \| \| \| \|	Merge branch 'tr-param-undefined-fix' into 'master'	Clement Ho	2019-08-20	3	-2/+27
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Embed metrics undefined param fix Closes #66177 See merge request gitlab-org/gitlab-ce!31975
\| * \| \| \| \| \| \|	Embed metrics undefined param fix	Tristan Read	2019-08-20	3	-2/+27
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'an-fix-sidekiq-histogram-buckets' into 'master'61061-links-to-sha-commits-in-release-notes-don-t-display-in-the-new-releases-page-but-do-display-on-the-tags-page	Kamil Trzciński	2019-08-20	3	-2/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow measurement of sidekiq jobs taking > 2.5s See merge request gitlab-org/gitlab-ce!32001
\| * \| \| \| \| \| \|	Allow measurement for Sidekiq jobs taking > 2.5s	Andrew Newdigate	2019-08-20	3	-2/+11
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/66319.
* \| \| \| \| \| \|	Merge branch 'rf-move-sast-reports-to-mr-widget-backend' into 'master'	Paul Slaughter	2019-08-20	1	-86/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move SAST reports logic for MR widget to backend See merge request gitlab-org/gitlab-ce!31770
\| * \| \| \| \| \| \|	Move SAST reports logic for MR widget to backend	rossfuhrman	2019-08-20	1	-86/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update spec that is changed in corresponding EE MR
* \| \| \| \| \| \|	Merge branch 'sh-fix-issues-api-gitaly-nplusone' into 'master'	Sean McGivern	2019-08-20	7	-5/+26
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Gitaly N+1 calls with listing issues/MRs via API Closes #66202 See merge request gitlab-org/gitlab-ce!31938