Commit Graph

55 Commits

Author SHA1 Message Date
GitLab Bot 921173681c Add latest changes from gitlab-org/gitlab@master 2021-03-10 09:09:29 +00:00
GitLab Bot c982bb363b Add latest changes from gitlab-org/gitlab@master 2021-02-17 15:09:21 +00:00
GitLab Bot eef0c69d45 Add latest changes from gitlab-org/gitlab@master 2021-02-12 21:09:01 +00:00
GitLab Bot d8714cf67c Add latest changes from gitlab-org/gitlab@master 2021-02-02 00:09:14 +00:00
GitLab Bot cb36ae7dd5 Add latest changes from gitlab-org/gitlab@master 2020-12-08 21:10:06 +00:00
GitLab Bot 9c3e48166e Add latest changes from gitlab-org/gitlab@master 2020-05-28 03:08:08 +00:00
GitLab Bot 3ad11f24ca Add latest changes from gitlab-org/gitlab@master 2019-12-22 09:07:51 +00:00
GitLab Bot 9763c08170 Add latest changes from gitlab-org/gitlab@master 2019-12-17 03:07:45 +00:00
GitLab Bot 175b4fa261 Add latest changes from gitlab-org/gitlab@master 2019-12-11 18:08:10 +00:00
GitLab Bot 84a0e65ac8 Add latest changes from gitlab-org/gitlab@master 2019-11-07 12:06:21 +00:00
GitLab Bot 8e45d25f7d Add latest changes from gitlab-org/gitlab@master 2019-10-16 18:08:01 +00:00
GitLab Bot 3d13802bc2 Add latest changes from gitlab-org/gitlab@master 2019-10-15 09:06:09 +00:00
GitLab Bot 40597fdec0 Add latest changes from gitlab-org/gitlab@master 2019-10-08 18:05:56 +00:00
GitLab Bot 427b23c127 Add latest changes from gitlab-org/gitlab@master 2019-10-03 00:05:59 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Dinesh Panda 736b5908da Avoid calling freeze on already frozen strings in lib 2019-09-10 08:11:43 +00:00
Doug Stull fa674fa5e6 Rename dev, org, com helper 2019-08-28 01:29:52 +00:00
Yorick Peterse 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
Robert Speicher 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
Yorick Peterse 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
Oswaldo Ferreira a1a0f8e6b0 Add DNS rebinding protection settings 2019-05-30 10:47:57 -03:00
Phil Hughes 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
Stan Hu f93b2e02a5 Run rubocop -a on CE files 2019-05-05 03:24:28 -07:00
Winnie Hellmann 78edcc2678 Allow to override Gitlab.ee? with IS_GITLAB_EE
(cherry picked from commit f3b74d59865a88be67663339447667c725961413)
2019-05-02 23:11:17 +02:00
Valery Sizov cc2e849afd Use a fixed git abbrev parameter when we fetch a git revision 2019-03-28 15:24:56 +02:00
Filipa Lacerda 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
Brandon Labuschagne def2b548d2 Revert the "What's new" feature 2019-01-29 20:45:47 +00:00
Andrew Newdigate 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
Brandon Labuschagne cc281afb27 Resolve "Add "What's new" menu item in top navigation" 2019-01-14 16:10:19 +00:00
Kamil Trzciński 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
gfyoung 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
Bob Van Landuyt 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
Rémy Coutable 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
Balasankar C 9f76632d80 Add installation type to usage ping data 2018-06-07 15:01:20 +00:00
Rémy Coutable 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
Rémy Coutable 02f17a0988
Introduce a new CacheableAttributes concern
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-23 16:14:43 +02:00
Rémy Coutable 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
Oswaldo Ferreira 132f7d33a9 Backport dev env check for storage settings deprecation 2018-04-24 17:29:44 -03:00
Kamil Trzciński 575302c1b9 Do not preload settings 2018-04-24 19:32:06 +02:00
Rémy Coutable 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
Rémy Coutable 5b44097cf7
Address latest feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 13:02:07 +02:00
Rémy Coutable 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
Oswaldo Ferreira f39a7af0f7 Add .org? method to Gitlab helper
dev_env_or_com? now considers dev.gitlab.org
2018-04-17 11:21:03 -03:00
Oswaldo Ferreira 2c8d4f1a45 Backport GitLab domain helper methods 2018-04-13 14:52:33 -03:00
Zeger-Jan van de Weg 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
Sean McGivern 68f8a798f2 Include the ee/ directory in backtraces 2018-03-12 10:14:52 +00:00
Toon Claes 7188b4d839 Make the revision on the `/help` page clickable
For quicker access, add hyperlink to the gitlab.com commits page for the current
REVISION of GitLab.
2017-06-09 10:35:42 +02:00
Robert Speicher d3d0e3dd5d Update `Gitlab.com?` to support staging 2016-06-27 15:10:36 -04:00
Rémy Coutable 5589dcf8db Fix a few places where autoloading would fail
- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 11:51:19 +02:00
Robert Speicher 2e13f6c326 Add `Gitlab.com?` method
To be used as a feature flag for GitLab.com-only features, such as
welcome emails.

We will be careful to only use this to disable features or functionality
that do not make sense for any installations that aren't GitLab.com. We
will not use this to restrict features from other installations or keep
them "exclusive" to GitLab.com.
2016-04-12 17:30:11 -04:00