38a1a6cb91 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-06-18 12:10:03 +00:00  
				
					
						
							
							
								 
						
							
								8f30cb223b 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-06-14 03:09:53 +00:00  
				
					
						
							
							
								 
						
							
								023e050d82 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-05-05 12:10:33 +00:00  
				
					
						
							
							
								 
						
							
								a5605d87fb 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-04-13 18:11:28 +00:00  
				
					
						
							
							
								 
						
							
								921173681c 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-03-10 09:09:29 +00:00  
				
					
						
							
							
								 
						
							
								c982bb363b 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-02-17 15:09:21 +00:00  
				
					
						
							
							
								 
						
							
								eef0c69d45 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-02-12 21:09:01 +00:00  
				
					
						
							
							
								 
						
							
								d8714cf67c 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2021-02-02 00:09:14 +00:00  
				
					
						
							
							
								 
						
							
								cb36ae7dd5 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2020-12-08 21:10:06 +00:00  
				
					
						
							
							
								 
						
							
								9c3e48166e 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2020-05-28 03:08:08 +00:00  
				
					
						
							
							
								 
						
							
								3ad11f24ca 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-12-22 09:07:51 +00:00  
				
					
						
							
							
								 
						
							
								9763c08170 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-12-17 03:07:45 +00:00  
				
					
						
							
							
								 
						
							
								175b4fa261 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-12-11 18:08:10 +00:00  
				
					
						
							
							
								 
						
							
								84a0e65ac8 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-11-07 12:06:21 +00:00  
				
					
						
							
							
								 
						
							
								8e45d25f7d 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-10-16 18:08:01 +00:00  
				
					
						
							
							
								 
						
							
								3d13802bc2 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-10-15 09:06:09 +00:00  
				
					
						
							
							
								 
						
							
								40597fdec0 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-10-08 18:05:56 +00:00  
				
					
						
							
							
								 
						
							
								427b23c127 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-10-03 00:05:59 +00:00  
				
					
						
							
							
								 
						
							
								b7dfe2ae40 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							
							
						 
						
							2019-09-13 13:26:31 +00:00  
				
					
						
							
							
								 
						
							
								736b5908da 
								
							 
						 
						
							
							
								
								Avoid calling freeze on already frozen strings in lib  
							
							
							
						 
						
							2019-09-10 08:11:43 +00:00  
				
					
						
							
							
								 
						
							
								fa674fa5e6 
								
							 
						 
						
							
							
								
								Rename dev, org, com helper  
							
							
							
						 
						
							2019-08-28 01:29:52 +00:00  
				
					
						
							
							
								 
						
							
								d7a4c1d2a5 
								
							 
						 
						
							
							
								
								Backport EE changes made to the scripts/ directory  
							
							... 
							
							
							
							This backport changes made by EE to the files in the scripts/ directory.
This comes with a few changes to some scripts to make them work in the
single codebase setup. 
							
						 
						
							2019-07-29 13:53:20 +02:00  
				
					
						
							
							
								 
						
							
								5ec2146c4a 
								
							 
						 
						
							
							
								
								Add Gitlab.ee method  
							
							... 
							
							
							
							This method yields to the given block when the installation is EE. 
							
						 
						
							2019-06-26 11:29:41 -05:00  
				
					
						
							
							
								 
						
							
								0e41564762 
								
							 
						 
						
							
							
								
								Backport gitlab.yml.example from EE  
							
							... 
							
							
							
							To make this happen, we need to conditionally add the group_saml
strategy when running tests, but only on EE. This requires some changes
to Gitlab.ee? so that it can be used before/without loading the Rails
environment. We also have to change how we require a few files, so this
can run outside of Rails. 
							
						 
						
							2019-06-20 14:51:49 +02:00  
				
					
						
							
							
								 
						
							
								a1a0f8e6b0 
								
							 
						 
						
							
							
								
								Add DNS rebinding protection settings  
							
							
							
						 
						
							2019-05-30 10:47:57 -03:00  
				
					
						
							
							
								 
						
							
								06b06736eb 
								
							 
						 
						
							
							
								
								Merge branch 'winh-separate-frontend-fixtures' into 'master'  
							
							... 
							
							
							
							Generate EE-specific JavaScript fixtures into ee/ directory  (CE-backport)
See merge request gitlab-org/gitlab-ce!28032  
							
						 
						
							2019-05-07 07:45:42 +00:00  
				
					
						
							
							
								 
						
							
								f93b2e02a5 
								
							 
						 
						
							
							
								
								Run rubocop -a on CE files  
							
							
							
						 
						
							2019-05-05 03:24:28 -07:00  
				
					
						
							
							
								 
						
							
								78edcc2678 
								
							 
						 
						
							
							
								
								Allow to override Gitlab.ee? with IS_GITLAB_EE  
							
							... 
							
							
							
							(cherry picked from commit f3b74d59865a88be67663339447667c725961413) 
							
						 
						
							2019-05-02 23:11:17 +02:00  
				
					
						
							
							
								 
						
							
								cc2e849afd 
								
							 
						 
						
							
							
								
								Use a fixed git abbrev parameter when we fetch a git revision  
							
							
							
						 
						
							2019-03-28 15:24:56 +02:00  
				
					
						
							
							
								 
						
							
								ec7835946a 
								
							 
						 
						
							
							
								
								Creates a function to check if repo is EE  
							
							... 
							
							
							
							Adds EE information to gon
Creates a global vue mixin 
							
						 
						
							2019-03-04 08:20:37 +00:00  
				
					
						
							
							
								 
						
							
								def2b548d2 
								
							 
						 
						
							
							
								
								Revert the "What's new" feature  
							
							
							
						 
						
							2019-01-29 20:45:47 +00:00  
				
					
						
							
							
								 
						
							
								2c0d69d310 
								
							 
						 
						
							
							
								
								Extract process_name from GitLab::Sentry  
							
							... 
							
							
							
							GitLab::Sentry has a program_context method to determine whether a
Sentry exception occurred in Sidekiq or rails. Since we will need
similar functionality for distributed tracing, this change extracts the
program_context method into GitLab.process_name for more general
consumption. 
							
						 
						
							2019-01-16 15:29:05 +02:00  
				
					
						
							
							
								 
						
							
								cc281afb27 
								
							 
						 
						
							
							
								
								Resolve "Add "What's new" menu item in top navigation"  
							
							
							
						 
						
							2019-01-14 16:10:19 +00:00  
				
					
						
							
							
								 
						
							
								c3bd3bfc6e 
								
							 
						 
						
							
							
								
								Improve variables support  
							
							... 
							
							
							
							This ensures that variables accept only string,
alongside also improves kubernetes_namespace,
improving validation and default value being set. 
							
						 
						
							2018-11-19 14:09:39 +01:00  
				
					
						
							
							
								 
						
							
								d598e4fd93 
								
							 
						 
						
							
							
								
								Enable more frozen string in lib/**/*.rb  
							
							... 
							
							
							
							Enables frozen for the following:
* lib/*.rb
* lib/banzai/**/*.rb
* lib/bitbucket/**/*.rb
* lib/constraints/**/*.rb
* lib/container_registry/**/*.rb
* lib/declarative_policy/**/*.rb
Partially addresses #47424 . 
							
						 
						
							2018-10-06 17:02:50 -07:00  
				
					
						
							
							
								 
						
							
								b09e40624b 
								
							 
						 
						
							
							
								
								Show the commit-sha for pre-release versions  
							
							... 
							
							
							
							The pre-release tags are set at the beginning of a release, so it
would be impossible to figure out which version was running if we're
running nightlies.
In that case it's better to still link to the SHA. These versions
don't get deployed to .com. 
							
						 
						
							2018-10-02 16:11:32 +02:00  
				
					
						
							
							
								 
						
							
								f349f2a68c 
								
							 
						 
						
							
							
								
								Stop relying on migrations in the CacheableAttributes cache key and cache attributes for 1 minute instead  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-07-05 12:34:15 +02:00  
				
					
						
							
							
								 
						
							
								9f76632d80 
								
							 
						 
						
							
							
								
								Add installation type to usage ping data  
							
							
							
						 
						
							2018-06-07 15:01:20 +00:00  
				
					
						
							
							
								 
						
							
								d50a80a282 
								
							 
						 
						
							
							
								
								Replace Gitlab::REVISION with Gitlab.revision and handle installations without a .git directory  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-05-24 10:14:01 +02:00  
				
					
						
							
							
								 
						
							
								02f17a0988 
								
							 
						 
						
							
							
								
								Introduce a new CacheableAttributes concern  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-05-23 16:14:43 +02:00  
				
					
						
							
							
								 
						
							
								e6f6f8e7a3 
								
							 
						 
						
							
							
								
								Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' into 'master'  
							
							... 
							
							
							
							Backport dev env check for storage settings deprecation
See merge request gitlab-org/gitlab-ce!18461  
							
						 
						
							2018-04-25 08:31:32 +00:00  
				
					
						
							
							
								 
						
							
								132f7d33a9 
								
							 
						 
						
							
							
								
								Backport dev env check for storage settings deprecation  
							
							
							
						 
						
							2018-04-24 17:29:44 -03:00  
				
					
						
							
							
								 
						
							
								575302c1b9 
								
							 
						 
						
							
							
								
								Do not preload settings  
							
							
							
						 
						
							2018-04-24 19:32:06 +02:00  
				
					
						
							
							
								 
						
							
								2afe3a1210 
								
							 
						 
						
							
							
								
								Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-04-23 16:12:19 +02:00  
				
					
						
							
							
								 
						
							
								5b44097cf7 
								
							 
						 
						
							
							
								
								Address latest feedback  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-04-23 13:02:07 +02:00  
				
					
						
							
							
								 
						
							
								c286c66f57 
								
							 
						 
						
							
							
								
								Move Settings to its own file, isolate it from Rails and introduce Gitlab.root  
							
							... 
							
							
							
							Signed-off-by: Rémy Coutable <remy@rymai.me> 
							
						 
						
							2018-04-23 12:20:30 +02:00  
				
					
						
							
							
								 
						
							
								f39a7af0f7 
								
							 
						 
						
							
							
								
								Add .org? method to Gitlab helper  
							
							... 
							
							
							
							dev_env_or_com? now considers dev.gitlab.org 
							
						 
						
							2018-04-17 11:21:03 -03:00  
				
					
						
							
							
								 
						
							
								2c8d4f1a45 
								
							 
						 
						
							
							
								
								Backport GitLab domain helper methods  
							
							
							
						 
						
							2018-04-13 14:52:33 -03:00  
				
					
						
							
							
								 
						
							
								a752c56ca8 
								
							 
						 
						
							
							
								
								Deprecate legacy disk paths  
							
							... 
							
							
							
							Direct disk access is impossible on environments where components run in
their own container. There for constructing the path should not be done
except for exceptional cases.
One of the considerations, instead of logging, was to use Sentry. For
now I've chosen not to use this as the impact of this change is hard to
determine. Getting this in now will allow us to checkout the impact on
dev.gitlab.org and staging. 
							
						 
						
							2018-04-12 15:23:36 +02:00  
				
					
						
							
							
								 
						
							
								68f8a798f2 
								
							 
						 
						
							
							
								
								Include the ee/ directory in backtraces  
							
							
							
						 
						
							2018-03-12 10:14:52 +00:00