GitLab Bot
1ea7dedfce
Add latest changes from gitlab-org/gitlab@master
2020-06-24 21:08:46 +00:00
GitLab Bot
0526dc1e68
Add latest changes from gitlab-org/gitlab@master
2020-06-11 12:08:54 +00:00
GitLab Bot
963838b90c
Add latest changes from gitlab-org/gitlab@master
2020-06-05 09:08:05 +00:00
GitLab Bot
340fd2966e
Add latest changes from gitlab-org/gitlab@master
2020-06-04 00:08:17 +00:00
GitLab Bot
f3e7bc8060
Add latest changes from gitlab-org/gitlab@master
2020-06-02 18:08:32 +00:00
GitLab Bot
810bd2a662
Add latest changes from gitlab-org/gitlab@master
2020-06-02 12:08:33 +00:00
GitLab Bot
8b78957052
Add latest changes from gitlab-org/gitlab@master
2020-05-29 09:08:06 +00:00
GitLab Bot
7892ed2e23
Add latest changes from gitlab-org/gitlab@master
2020-05-27 09:08:30 +00:00
GitLab Bot
21539fe9ab
Add latest changes from gitlab-org/gitlab@master
2020-05-22 00:08:07 +00:00
GitLab Bot
95ab36cd97
Add latest changes from gitlab-org/gitlab@master
2020-05-15 21:08:21 +00:00
GitLab Bot
aebabf8f5a
Add latest changes from gitlab-org/gitlab@master
2020-05-15 00:08:06 +00:00
GitLab Bot
87f286558d
Add latest changes from gitlab-org/gitlab@master
2020-05-14 15:08:14 +00:00
GitLab Bot
41e8b05e8d
Add latest changes from gitlab-org/gitlab@master
2020-05-13 12:07:54 +00:00
GitLab Bot
bc692af988
Add latest changes from gitlab-org/gitlab@master
2020-05-09 00:09:39 +00:00
GitLab Bot
4279f24a19
Add latest changes from gitlab-org/gitlab@master
2020-05-06 12:09:36 +00:00
GitLab Bot
3795b229ab
Add latest changes from gitlab-org/gitlab@master
2020-05-01 00:09:59 +00:00
GitLab Bot
39fa1b5987
Add latest changes from gitlab-org/gitlab@master
2020-04-27 09:09:51 +00:00
GitLab Bot
e33f87ac0f
Add latest changes from gitlab-org/gitlab@master
2020-04-21 15:21:10 +00:00
GitLab Bot
b7c735c8ac
Add latest changes from gitlab-org/gitlab@master
2020-04-15 12:09:18 +00:00
GitLab Bot
00a8c64ffd
Add latest changes from gitlab-org/gitlab@master
2020-04-15 06:09:49 +00:00
GitLab Bot
254ec28f54
Add latest changes from gitlab-org/gitlab@master
2020-04-09 21:09:19 +00:00
GitLab Bot
a9ced7da44
Add latest changes from gitlab-org/gitlab@master
2020-04-09 12:09:24 +00:00
GitLab Bot
5d75b2b9a9
Add latest changes from gitlab-org/gitlab@master
2020-03-25 18:08:10 +00:00
GitLab Bot
8f9beefac3
Add latest changes from gitlab-org/gitlab@master
2020-03-23 12:09:47 +00:00
GitLab Bot
f2dfd9ee81
Add latest changes from gitlab-org/gitlab@master
2020-03-22 15:09:49 +00:00
GitLab Bot
78d8830cec
Add latest changes from gitlab-org/gitlab@master
2020-03-19 15:09:41 +00:00
GitLab Bot
77d15aff0e
Add latest changes from gitlab-org/gitlab@master
2020-03-19 00:09:27 +00:00
GitLab Bot
aaf5961054
Add latest changes from gitlab-org/gitlab@master
2020-03-18 15:09:45 +00:00
GitLab Bot
2c156e3c7b
Add latest changes from gitlab-org/gitlab@master
2020-03-17 18:09:44 +00:00
GitLab Bot
cbfe03ae04
Add latest changes from gitlab-org/gitlab@master
2020-03-16 12:09:12 +00:00
GitLab Bot
dc889678d1
Add latest changes from gitlab-org/gitlab@master
2020-03-12 15:09:39 +00:00
GitLab Bot
cd52759ee3
Add latest changes from gitlab-org/gitlab@master
2020-03-12 12:09:17 +00:00
GitLab Bot
18f7828977
Add latest changes from gitlab-org/gitlab@master
2020-03-12 09:09:55 +00:00
GitLab Bot
a8de96bff5
Add latest changes from gitlab-org/gitlab@master
2020-03-05 18:08:19 +00:00
GitLab Bot
77237c5a6b
Add latest changes from gitlab-org/gitlab@master
2020-03-05 00:07:49 +00:00
GitLab Bot
561e1b470f
Add latest changes from gitlab-org/gitlab@master
2020-03-02 21:08:01 +00:00
GitLab Bot
951616a26a
Add latest changes from gitlab-org/gitlab@master
2020-02-25 18:09:02 +00:00
GitLab Bot
a6c2be7cd2
Add latest changes from gitlab-org/gitlab@master
2020-02-21 21:08:57 +00:00
GitLab Bot
c7e385e282
Add latest changes from gitlab-org/gitlab@master
2020-02-19 15:09:09 +00:00
GitLab Bot
56201db1dc
Add latest changes from gitlab-org/gitlab@master
2020-02-17 03:09:00 +00:00
GitLab Bot
55733b19c5
Add latest changes from gitlab-org/gitlab@master
2020-02-11 06:09:46 +00:00
GitLab Bot
76623c12c1
Add latest changes from gitlab-org/gitlab@master
2020-02-05 21:09:02 +00:00
GitLab Bot
50ae406553
Add latest changes from gitlab-org/gitlab@master
2020-01-30 12:08:54 +00:00
GitLab Bot
fedf978f9a
Add latest changes from gitlab-org/gitlab@master
2020-01-28 15:08:36 +00:00
GitLab Bot
bbf6581214
Add latest changes from gitlab-org/gitlab@master
2020-01-28 06:09:01 +00:00
GitLab Bot
e4ea43b2b8
Add latest changes from gitlab-org/gitlab@master
2020-01-27 21:08:47 +00:00
GitLab Bot
411cc77938
Add latest changes from gitlab-org/gitlab@master
2020-01-24 18:09:00 +00:00
GitLab Bot
0f8c2334f0
Add latest changes from gitlab-org/gitlab@master
2020-01-23 06:08:32 +00:00
GitLab Bot
be3e24ea3c
Add latest changes from gitlab-org/gitlab@master
2020-01-22 12:08:40 +00:00
GitLab Bot
d47f9d2304
Add latest changes from gitlab-org/gitlab@master
2020-01-16 15:08:41 +00:00
GitLab Bot
571d993b49
Add latest changes from gitlab-org/gitlab@master
2020-01-15 18:08:34 +00:00
GitLab Bot
e879335864
Add latest changes from gitlab-org/gitlab@master
2020-01-09 00:07:40 +00:00
GitLab Bot
015663b70f
Add latest changes from gitlab-org/gitlab@master
2020-01-06 21:07:43 +00:00
GitLab Bot
898e2cc1df
Add latest changes from gitlab-org/gitlab@master
2019-12-20 09:24:38 +00:00
GitLab Bot
b5571e6e22
Add latest changes from gitlab-org/gitlab@master
2019-12-19 18:07:48 +00:00
GitLab Bot
5bd24a54ef
Add latest changes from gitlab-org/gitlab@master
2019-12-17 09:07:48 +00:00
GitLab Bot
69d6d3ca20
Add latest changes from gitlab-org/gitlab@master
2019-12-16 21:08:00 +00:00
GitLab Bot
862d225ca0
Add latest changes from gitlab-org/gitlab@master
2019-12-16 15:07:39 +00:00
GitLab Bot
99ddca0d88
Add latest changes from gitlab-org/gitlab@master
2019-12-06 21:07:54 +00:00
GitLab Bot
63894d59ab
Add latest changes from gitlab-org/gitlab@master
2019-12-06 12:06:21 +00:00
GitLab Bot
8723197387
Add latest changes from gitlab-org/gitlab@master
2019-12-05 12:07:43 +00:00
GitLab Bot
8644755363
Add latest changes from gitlab-org/gitlab@master
2019-12-01 06:06:11 +00:00
GitLab Bot
eac0da9a47
Add latest changes from gitlab-org/gitlab@master
2019-11-29 15:06:43 +00:00
GitLab Bot
20758bc3b3
Add latest changes from gitlab-org/gitlab@master
2019-11-27 18:06:30 +00:00
GitLab Bot
2477ab5553
Add latest changes from gitlab-org/gitlab@master
2019-11-20 21:06:38 +00:00
GitLab Bot
3fc9a8e695
Add latest changes from gitlab-org/gitlab@master
2019-11-15 12:06:12 +00:00
GitLab Bot
56d96ad7fa
Add latest changes from gitlab-org/gitlab@master
2019-11-01 03:06:26 +00:00
GitLab Bot
11faf8ae72
Add latest changes from gitlab-org/gitlab@master
2019-10-23 21:06:17 +00:00
GitLab Bot
ad1e4b8fb8
Add latest changes from gitlab-org/gitlab@master
2019-10-21 15:05:58 +00:00
GitLab Bot
8e45d25f7d
Add latest changes from gitlab-org/gitlab@master
2019-10-16 18:08:01 +00:00
GitLab Bot
77a7772c3b
Add latest changes from gitlab-org/gitlab@master
2019-10-08 09:06:09 +00:00
GitLab Bot
185f428fa5
Add latest changes from gitlab-org/gitlab@master
2019-10-07 12:06:18 +00:00
GitLab Bot
5ecacec304
Add latest changes from gitlab-org/gitlab@master
2019-10-04 15:06:38 +00:00
GitLab Bot
e66d6781ef
Add latest changes from gitlab-org/gitlab@master
2019-09-26 18:06:29 +00:00
GitLab Bot
f1a5755898
Add latest changes from gitlab-org/gitlab@master
2019-09-24 15:06:34 +00:00
GitLab Bot
d46287cc16
Add latest changes from gitlab-org/gitlab@master
2019-09-20 12:05:52 +00:00
GitLab Bot
6cd5b7dbfa
Add latest changes from gitlab-org/gitlab@master
2019-09-19 11:50:12 +00:00
GitLab Bot
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
Peter Leitzen
50c647af51
Add rake task `db:obsolete_ignored_columns`
...
Show a list of obsolete `ignored_columns`
2019-09-11 16:23:42 +00:00
Dinesh Panda
736b5908da
Avoid calling freeze on already frozen strings in lib
2019-09-10 08:11:43 +00:00
Ash McKenzie
9fc9ab2ba2
Add new GitlabDanger class
...
This class encapsulates our use of the Danger gem.
2019-09-06 11:21:53 +00:00
Ash McKenzie
f34e4545ec
Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"
...
This reverts merge request !32196
2019-09-06 07:14:30 +00:00
Ash McKenzie
fdc17ebc03
Add new danger_local Rake task
...
The benefit of running the danger_local Rake task
is that it displays some informational messages
for clarity and also exits with 1 if there's any
output.
2019-09-06 10:56:48 +10:00
GitLab Release Tools Bot
34c2b6adf9
Merge branch 'security-personal-snippets' into 'master'
...
Add direct upload support for personal snippets
See merge request gitlab/gitlabhq!3226
2019-08-29 21:34:22 +00:00
shampton
c96adfcd6c
Move visual review toolbar to NPM
...
Remove the visual review toolbar code
in favor of using the NPM package.
2019-08-23 12:57:21 -07:00
Jan Provaznik
41d52bbfe9
Add direct upload support for personal snippets
2019-08-23 11:19:14 +02:00
Michael Kozono
9eabc0d6fc
Merge branch 'legacy-attachments-migrate-fix' into 'master'
...
Migrate legacy uploads rake tasks
See merge request gitlab-org/gitlab-ce!29409
2019-08-16 22:07:56 +00:00
Jarka Košanová
19db315734
Add rake tasks for migrating leacy uploads
...
- move uploads created by AttachmentUploader
- handle also files created for legacy_diff_notes
2019-08-16 07:52:30 +02:00
Hordur Freyr Yngvason
d3c5ff7b72
Squash project templates on update
...
As per https://gitlab.com/gitlab-org/gitlab-ce/issues/46043 , project
templates should be squashed before updating, so that repositories
created from these templates don't include the full history of the
backing repository.
2019-08-15 20:20:08 +00:00
Hordur Freyr Yngvason
37ffbeeab1
Make ruby 2.6 the officially supported version
2019-08-14 23:16:55 +00:00
Hordur Freyr Yngvason
012fe3141e
Fix broken update_project_templates rake task
...
This rake task had been broken for a while. This fixes the breakages,
adds a test to help avoid future breakages, and adds a few ergonomic
improvements to the task itself.
2019-07-30 13:52:28 +00:00
Lin Jen-Shin
dbe3b9848b
Merge branch 'resolve-scripts-differences' into 'master'
...
Backport EE changes made to the scripts/ directory
See merge request gitlab-org/gitlab-ce!31015
2019-07-29 15:15:46 +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
Andreas Brandl
988dc80585
Further remove code branches by database type
...
We dropped MySQL support and a lot of mysql specific code has been
removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29608 .
This comes in from the other direction and removes any `if postgresql?`
branches.
2019-07-29 12:47:06 +02:00
Heinrich Lee Yu
2b3d00a778
Remove unneeded monkey-patch
...
Changes all calls to data_source_exists? to table_exists?
since that is the intent of these calls
2019-07-25 12:21:38 +08:00
Douwe Maan
50ab880f80
Merge branch 'cleanup/spec-tasks' into 'master'
...
Resolves confusion within spec rake tasks.
See merge request gitlab-org/gitlab-ce!31073
2019-07-24 18:47:23 +00:00
Jeremy Jackson
271a6d1b8f
Resolves confusion within spec rake tasks
2019-07-23 18:34:50 -06:00
Nick Thomas
4aa76dddec
Remove dead MySQL code
...
None of this code can be reached any more, so it can all be removed
2019-07-23 16:53:03 +01:00
Imre Farkas
313f145b55
Rake task to cleanup expired ActiveSession lookup keys
...
In some cases ActiveSession.cleanup was not called after authentication,
so for some user ActiveSession lookup keys grew without ever cleaning
up. This Rake task manually iterates over the lookup keys and removes
ones without existing ActiveSession.
2019-07-22 17:15:57 +02:00
Mike Greiling
97b8f85e03
Move frontend fixtures into spec/frontend
...
Moves every fixture source file from
spec/javascripts to spec/frontend
2019-07-19 02:27:15 -05:00
Mike Greiling
faa17d5263
Rename the karma:fixtures task
...
Introduces frontend:fixtures rake task to replace
karma:fixtures and update documentation and CI scripts
to match
2019-07-19 02:27:14 -05:00
Stan Hu
ef3f638642
Merge branch 'jc-fix-rugged-feature-flag-rake' into 'master'
...
Add unset_rugged rake task
Closes #64441
See merge request gitlab-org/gitlab-ce!30636
2019-07-16 20:40:42 +00:00
Brett Walker
0175a7ab15
Allow parameters for rake gitlab:seed:issues
...
to specify backfill_weeks and average_issues_per_week
2019-07-15 11:33:39 -05:00
Douglas Barbosa Alexandre
06b8fe5607
Merge branch '63667-hashed-storage-migration-count-correctly' into 'master'
...
Display the amount for Hashed Storage migration/rollback correctly
Closes #63667
See merge request gitlab-org/gitlab-ce!29996
2019-07-11 16:57:04 +00:00
John Cai
ff0654b0b4
Add unset_rugged rake task
...
Adds an unset_rugged rake task that unsets all rugged feature flags.
Also fixes the existing disable_rugged task to have it explicitly
disable feature flags instead of just unsetting them.
2019-07-11 09:53:41 -07:00
Felipe Artur
f0683aab05
Improve Graphql Docs
...
Adds more friendly docs for GraphQl implementation
2019-07-11 08:06:35 +00:00
Gabriel Mazetto
d8cad8837c
Display the amount for Hashed Storage migration/rollback correctly
...
Rake script considers the specified range, if present, to calculate
the affected amount of projects correctly.
2019-07-10 22:14:50 +01:00
Mayra Cabrera
0ab89d8e36
Add a rubocop for Rails.logger
...
Suggests to use a JSON structured log instead
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
2019-07-10 19:26:47 +00:00
Lukas Eipert
d5842e7490
Prefer offline install for yarn
2019-07-02 16:29:47 +02:00
Nick Thomas
131523ef89
Remove migrations from setup_postgresql
2019-07-02 09:35:03 +01:00
Dmitriy Zaporozhets
f63dc06cb4
Merge branch 'tc-rake-orphan-artifacts' into 'master'
...
Add rake task to clean orphan artifact files
See merge request gitlab-org/gitlab-ce!29681
2019-07-01 08:04:57 +00:00
Toon Claes
dabd91b2c8
Add rake task to clean orphan artifact files
...
This adds the rake task rake
gitlab:cleanup:orphan_job_artifact_files. This rake task cleans all
orphan job artifact files it can find on disk.
It performs a search on the complete folder of all artifacts on
disk. Then it filters out all the job artifact ID for which it could
not find a record with matching ID in the database. For these, the
file is deleted from disk.
2019-06-28 10:02:18 +02:00
DJ Mountney
de93bf1fbb
Update comments and docs around min schema version
...
Fixed some spelling
Dropped rake task description for a prefix only task
Added note on skipping the check to the postgres debugging dev doc
2019-06-25 10:44:40 -07:00
DJ Mountney
e1befc9b3f
Drop the source upgrade change
...
We no longer need to point people away from using db:migrate
2019-06-25 10:44:40 -07:00
DJ Mountney
e448124fab
Add an flag for skipping the schema version check
...
If you chose to use the rollback migration feature on your current
version for example, you should still have a way to migrate, being
that you are still on a supported migration path.
2019-06-25 10:44:40 -07:00
DJ Mountney
f4232d848e
Fix db:migrate for fresh installs
2019-06-25 10:44:40 -07:00
DJ Mountney
f4e1553519
Move min schema version check to db:migrate
...
Rather than have it checked only as part of gitlab:db:configure, we will
instead have it as a pre-req for every db:migrate command
2019-06-25 10:44:40 -07:00
DJ Mountney
7a089438fa
Check supported version when migrating
...
Set the mininum supported migration version to be the schema version as
of 11.11.0, and errors you if that is not detected during
gitlab:db:configure
2019-06-25 10:44:40 -07:00
Stan Hu
ad3abd1d3a
Silence backup warnings when CRON=1 in use
...
If CRON=1 is in use, we shouldn't generate any output or admins may be
notified via e-mail about unnecessary warnings.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
2019-06-25 06:30:51 -07:00
Yorick Peterse
8469f59d78
Backport the EE schema and migrations to CE
...
This backports all EE schema changes to CE, including EE migrations,
ensuring both use the same schema.
== Updated tests
A spec related to ghost and support bot users had to be modified to make
it pass. The spec in question assumes that the "support_bot" column
exists when defining the spec. In the single codebase setup this is not
the case, as the column is backported in a later migration. Any attempt
to use a different schema version or use of "around" blocks to
conditionally disable specs won't help, as reverting the backport
migration would also drop the "support_bot" column. Removing the
"support_bot" tests entirely appears to be the only solution.
We also need to update some foreign key tests now that we have
backported the EE columns. Fortunately, these changes are very minor.
== Backporting migrations
This commit moves EE specific migrations (except those for the Geo
tracking database) and related files to CE, and also removes any traces
of the ee/db directory.
Some migrations had to be modified or removed, as they no longer work
with the schema being backported. These migrations were all quite old,
so we opted for removing them where modifying them would take too much
time and effort.
Some old migrations were modified in EE, while also existing in CE. In
these cases we took the EE code, and in one case removed them entirely.
It's not worth spending time trying to merge these changes somehow as we
plan to remove old migrations around the release of 12.0, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
2019-06-17 17:09:05 +02:00
Brett Walker
2a5ddcc045
Show description of 'gettext:regenerate' task
2019-06-07 09:38:01 -05:00
Bob Van Landuyt
9a8955d3c0
Merge branch 'gitaly-version-v1.43.0' into 'master'
...
Upgrade Gitaly to v1.43.0
See merge request gitlab-org/gitlab-ce!28867
2019-05-31 14:16:54 +00:00
Zeger-Jan van de Weg
951afba624
Remove hook directory requirement from Shell
...
It used to be the case that GitLab created symlinks for each repository
to one copy of the Git hooks, so these ran when required. This changed
to set the hooks dynamically on Gitaly when invoking Git.
The side effect is that we didn't need all these symlinks anymore, which
Gitaly doesn't create anymore either. Now that means that the tests in
GitLab-Rails should test for it either.
Related: https://gitlab.com/gitlab-org/gitaly/issues/1392#note_175619926
2019-05-30 20:04:08 +02:00
Sarah Groff Hennigh-Palermo
9377eb1822
Build visual_review_toolbar with webpack
...
It takes a lot of lines to move a script
2019-05-29 20:24:15 +00:00
Rémy Coutable
6145ddf515
Revert "Merge branch 'revert-04c3c6dd' into 'master'"
...
This reverts commit 744f1f2e70
, reversing
changes made to c4d930e5f5
.
2019-05-22 21:47:32 +02:00
Kamil Trzciński
4f20c9de6f
Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"
...
This reverts merge request !27514
2019-05-22 11:45:46 +00:00
Kamil Trzciński
04c3c6dd5a
Merge branch 'reorganize-tests-jobs-by-level' into 'master'
...
Reorganize test jobs by level
See merge request gitlab-org/gitlab-ce!27514
2019-05-22 10:21:38 +00:00
Stan Hu
27381e22a9
Move files from lib/haml_lint to haml_lint
...
Files in lib will be eager loaded and hence will require haml_lint to be
loaded. Since this is only a development dependency, we can't assume
this gem will be available in production, so it should never be loaded
in production.
2019-05-21 19:49:14 -07:00
Rémy Coutable
4d9c76e9e4
Reorganize test jobs by level
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-20 14:31:58 +02:00
Lin Jen-Shin
e82f6d979f
Avoid pipes so it doesn't overflow
2019-05-18 11:18:10 +08:00
Ben Bodenmiller
2497917b65
delete feature flag when disabling Rugged
2019-05-13 08:57:10 +00:00
Cindy Pallares
deb5276f8b
Add warning that gitlab-secrets isn't included
...
Many customers forget to include the gitlab-secrets.json file. This adds
a warning that both gitlab-secrets.json and gitlab.rb are not included
in the backup.
2019-05-08 12:39:04 -05:00
Stan Hu
f93b2e02a5
Run rubocop -a on CE files
2019-05-05 03:24:28 -07:00
Stan Hu
a5620a0d23
Revert changes in lib/tasks/lint.rake
2019-05-05 03:24:28 -07:00
Stan Hu
09b44072e7
Remove stdout/stderr capture in static-analysis
2019-05-05 03:24:27 -07:00
Stan Hu
fee5b0a4bc
Add logging for time and lint start
2019-05-05 03:24:27 -07:00
Rémy Coutable
2537b0c1e0
Provide a new gitlab:seed:issues task
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-23 11:43:53 +02:00
Kamil Trzciński
650f40865e
Forbid the use of `#reload` and prefer `#reset`
...
The `#reload` makes to load all objects into memory,
and the main purpose of `#reload` is to drop the association cache.
The `#reset` seems to solve exactly that case.
2019-04-15 13:05:14 +02:00
Tim Zallmann
fb8908d961
Removed also the in the meanwhile introduced rake task
2019-04-10 13:51:14 -07:00
Tim Zallmann
c57529556c
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"
...
Reverts the loading of emojis and its images to move forward with RC
2019-04-10 11:49:06 -07:00
Robert Speicher
e036cb04a2
Merge branch 'remaining-lib-differences' into 'master'
...
Resolve remaining CE to EE differences in lib/
See merge request gitlab-org/gitlab-ce!26608
2019-04-03 12:27:55 +00:00
Yorick Peterse
1f4bc814ab
Backport EE changes to gitlab:env:info
...
This backports EE specific changes for the Rake task `gitlab:env:info`,
wrapping them in a conditional. There is no way to inject code in the
middle of a Rake task in EE, so unfortunately this is the best we can
do.
2019-04-02 14:57:44 +02:00
John Jarvis
69b65a6b74
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02
2019-04-02 10:12:32 +02:00
Jan Provaznik
a466d97e62
Rake task for removing exif from uploads
...
Adds a rake task which can be used for removing EXIF
data from existing uploads.
2019-04-02 07:48:35 +00:00
Wei-Meng Lee
cfc6d2528c
Fix attempting to drop views in PostgreSQL
2019-04-02 00:19:22 +00:00
Nick Thomas
98a5976b78
Document ApplicationRecord / pluck_primary_key
...
We also enable the rubocop that makes it mandatory
2019-03-29 20:54:06 +00:00
Douglas Barbosa Alexandre
a86f48c79b
Add helper method to return a human-friendly name for database adapter
2019-03-21 19:03:26 -03:00
Lin Jen-Shin
ae9d60ac2b
Merge branch '58844-follow-up-from-don-t-create-ee-specific-files-when-creating-emojis-fixture-files' into 'master'
...
Simplify JavaScriptFixturesHelpers
Closes gitlab-ee#10386, #58898 , and #58844
See merge request gitlab-org/gitlab-ce!26045
2019-03-19 14:37:08 +00:00
Patrick Bajao
26dadbc9c4
Integrate Gitlab::Keys with Gitlab::Shell
...
In this commit, some methods that aren't being used
are removed from `Gitlab::Shell`. They are the ff:
- `#remove_keys_not_found_in_db`
- `#batch_read_key_ids`
- `#list_key_ids`
The corresponding methods in `Gitlab::Keys` have been
removed as well.
2019-03-19 11:16:21 +00:00
Rémy Coutable
b789bfaeef
Simplify the JavaScriptFixturesHelpers module
...
- Only storing fixtures in one place
- This place changes whether we are in CE or EE
We discovered with @winh that only fixtures located under
spec/javascripts/fixtures are used, even in EE so there's no need to
clean/create fixtures in ee/spec/javascripts/fixtures.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-19 08:46:22 +01:00