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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add variables on pipeline webhook	Pierre Tardy	2018-10-01	1	-1/+2
\|
*	Merge remote-tracking branch 'dev/master'	Bob Van Landuyt	2018-10-01	3	-5/+33
\|\
\| *	Merge branch 'security-2697-code-highlight-timeout' into 'master'	Bob Van Landuyt	2018-10-01	1	-1/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix syntax highlight taking too long Closes #2697 See merge request gitlab/gitlabhq!2467
\| \| *	Fix syntax highlight taking too long	Mark Chao	2018-09-03	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Use Timeout to switch to plain rendering
\| * \|	[master] Stored XSS in Gitlab Merge Request from imported repository	Francisco Javier López	2018-10-01	1	-1/+1
\| \| \|
\| * \|	Merge branch 'fix-events-finder-incomplete' into 'master'	Bob Van Landuyt	2018-10-01	1	-3/+19
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Redact events shown in the events API See merge request gitlab/gitlabhq!2514
\| \| * \|	Redact events shown in the events API	Nick Thomas	2018-09-21	1	-3/+19
\| \| \| \|
* \| \| \|	Merge branch 'lib-api-frozen-string-enable' into 'master'	Rémy Coutable	2018-10-01	100	-1/+202
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in lib/api and lib/backup See merge request gitlab-org/gitlab-ce!22005
\| * \| \| \|	Enable frozen string in lib/api and lib/backup	gfyoung	2018-09-29	100	-1/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47424. Had to make changes to spec files because stubbing methods on frozen objects is a mess in RSpec and leads to failures: https://github.com/rspec/rspec-mocks/issues/1190
* \| \| \| \|	Merge branch '51021-more-attr-encrypted' into 'master'	Rémy Coutable	2018-10-01	3	-0/+114
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encrypt webhook tokens and URLs in the database Closes #51021 See merge request gitlab-org/gitlab-ce!21645
\| * \| \| \| \|	Migrate sensitive web hook data in the background	Nick Thomas	2018-10-01	2	-0/+108
\| \| \| \| \| \|
\| * \| \| \| \|	Encrypt webhook tokens and URLs in the database	Nick Thomas	2018-10-01	1	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/set-public-email-through-api' into 'master'	Rémy Coutable	2018-10-01	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set public email through api Closes #37675 See merge request gitlab-org/gitlab-ce!21938
\| * \| \| \| \|	allow users api to set public_email	Alexis Reigel	2018-10-01	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	remove obsolete parameter from users api	Alexis Reigel	2018-09-26	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-issue-52009' into 'master'	Sean McGivern	2018-10-01	1	-1/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Error 500s with invalid relative links Closes #52009 See merge request gitlab-org/gitlab-ce!22001
\| * \| \| \| \| \|	Prevent Error 500s with invalid relative links	Stan Hu	2018-09-29	1	-1/+5
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/52009
* \| \| \| \| \|	Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'	Nick Thomas	2018-10-01	3	-12/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC Closes #37433 See merge request gitlab-org/gitlab-ce!21921
\| * \| \| \| \| \|	Removes N+1 gitaly rpc call to fetch the last commit for path	Tiago Botelho	2018-10-01	3	-12/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements list_last_commits_for_tree to communicate with the ListLastCommitsForTree Gitaly RPC Bumps the Gitaly server version Bumps the Gitaly-Proto gem version
* \| \| \| \| \| \|	Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'	Dmitriy Zaporozhets	2018-10-01	1	-3/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip creating auto devops jobs for sast, container_scanning, dast,… See merge request gitlab-org/gitlab-ce!21959
\| * \| \| \| \| \| \|	Skip creating auto devops jobs for sast, container_scanning, dast, ↵48399-skip-auto-devops-jobs-based-on-license	Dylan Griffith	2018-09-27	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dependency_scanning when not licensed
* \| \| \| \| \| \| \|	Merge branch '51651-fill-pipeline-source-for-external-pipelines' into 'master'	Kamil Trzciński	2018-09-30	1	-0/+50
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fill pipeline source for external pipelines" Closes #51651 See merge request gitlab-org/gitlab-ce!21814
\| * \| \| \| \| \| \|	Refactor migration specs using ActiveRecord models	Matija Čupić	2018-09-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor external_pipelines query	Matija Čupić	2018-09-27	1	-8/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update all pipelines in single query	Matija Čupić	2018-09-27	1	-3/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add background migration to fill pipeline source	Matija Čupić	2018-09-25	1	-0/+54
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dz-migration-index-helper' into 'master'	Dmitriy Zaporozhets	2018-09-28	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add mysql_compatible_index_length to migration helpers Closes #50253 See merge request gitlab-org/gitlab-ce!21852
\| * \| \| \| \| \| \|	Add mysql_compatible_index_length to migration helpersdz-migration-index-helper	Dmitriy Zaporozhets	2018-09-21	1	-0/+4
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'mk/asymmetric-exists-cache' into 'master'	Stan Hu	2018-09-28	2	-48/+149
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Geo: Does not mark repositories as missing on primary due to stale cache" Closes #50211 and #44044 See merge request gitlab-org/gitlab-ce!21789
\| * \| \| \| \| \| \|	Remove send-in-send for safety and readability	Michael Kozono	2018-09-27	1	-13/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I attempted to refactor so that the caller of `wrap_method` passes in a block, rather than a method name, but I was unsuccessful. I kept getting the following error: NoMethodError: undefined method `cache_method_output' for Repository:Class If you can figure this out, then feel free to dry up these class methods again without doing a send-within-a-send.
\| * \| \| \| \| \| \|	Expire RequestStore cache properly	Michael Kozono	2018-09-27	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cache `Repository#exists?` false in RequestStore	Michael Kozono	2018-09-27	2	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Only truthy values are cached in Redis. * All values are cached in RequestStore and in an instance variable.
\| * \| \| \| \| \| \|	Extract `Repository.memoize_method` method	Michael Kozono	2018-09-27	1	-47/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And reuse `Gitlab::Utils::StrongMemoize`. There is a subtle behavior change required to reuse StrongMemoize in this case. The early fallback check now occurs before reading the memoized value instead of after. I think this is fine since a memoized value should only exist if `exists?` is also already memoized as `true`.
* \| \| \| \| \| \| \|	Extend reports to support security features	Olivier Gonzalez	2018-09-27	5	-76/+98
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '4907-improve-build-create-performance-for-license-management' ↵	Kamil Trzciński	2018-09-27	1	-8/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Dont create license_management build when not included in license See merge request gitlab-org/gitlab-ce!21958
\| * \| \| \| \| \| \| \|	Dont create license_management build when not included in license4907-improve-build-create-performance-for-license-management	Dylan Griffith	2018-09-27	1	-8/+7
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This improves CI performance since we do not create a whole new job that just exits quickly. This is important based on https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4907#note_104742212
* \| \| \| \| \| \| \|	Typo in log message of gitlab-rake gitlab:artifacts:migrate	Michael Bisbjerg	2018-09-27	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '43832-adds-chdmod-to-commits-actions-api' into 'master'	Rémy Coutable	2018-09-27	2	-2/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows to work with execute permissions in GitLab API Closes #43832 See merge request gitlab-org/gitlab-ce!21866
\| * \| \| \| \| \| \|	Adds chmod action to POST /projects/:id/repository/commits API	Jacopo	2018-09-27	2	-2/+22
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With this action the user can update the execute_filemode of a given file in the repository.
* \| \| \| \| \| \|	Merge branch 'feature/add-public-email-to-users-api' into 'master'	Rémy Coutable	2018-09-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature/add public email to users api Closes #39346 See merge request gitlab-org/gitlab-ce!21909
\| * \| \| \| \| \| \|	add user's public_email attribute to api	Alexis Reigel	2018-09-27	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '50289-vendor-ci-yml-for-the-last-time' into 'master'	Kamil Trzciński	2018-09-27	4	-19/+82
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update all gitlab CI templates from gitlab-org/gitlab-ci-yml for the last time See merge request gitlab-org/gitlab-ce!21929
\| * \| \| \| \| \| \|	Update all gitlab ci templates from gitlab-org/gitlab-ci-yml50289-vendor-ci-yml-for-the-last-time	Dylan Griffith	2018-09-27	4	-19/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we no longer maintain this separate repo we just needed to do one final copy from there. See https://gitlab.com/gitlab-org/gitlab-ce/issues/50289
* \| \| \| \| \| \| \|	Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-url	Rémy Coutable	2018-09-26	1	-60/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'	Kamil Trzciński	2018-09-26	1	-3/+28
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649
\| * \| \| \| \| \| \|	add status param to runners api	Alexis Reigel	2018-09-15	1	-0/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add type param to runners api	Alexis Reigel	2018-09-15	1	-3/+19
\| \|/ / / / / /
* \| \| \| \| \| \|	Resolve "Un-vendor CI templates"	Dylan Griffith	2018-09-26	47	-5/+2327
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tc-fix-rails5-subquery-selfjoin' into 'master'	Douwe Maan	2018-09-26	1	-1/+9
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around a bug in Rails 5, where LIMIT causes trouble Closes #51729 See merge request gitlab-org/gitlab-ce!21879
\| * \| \| \| \|	Work around a bug in Rails 5, where LIMIT causes troubletc-fix-rails5-subquery-selfjoin	Toon Claes	2018-09-25	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original code caused Rails to generate invalid SQL. The problem lays in the `.arel` method in `ActiveRecord::Relation`. When there was a `limit` on the relation, the `LIMIT` statement was taken over to Arel, but the value wasn't. ```ruby relation = Event.limit(2) relation.to_sql #=> "SELECT `events`.* FROM `events` LIMIT 2" relation.arel.to_sql #=> "SELECT `events`.* FROM `events` LIMIT ?" ``` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51729