Commit Graph

5576 Commits

Author SHA1 Message Date
Sean McGivern b63efb09a5 Merge branch 'sh-rugged-get-tree-entry' into 'master'
Bring back Rugged implementation of TreeEntry

See merge request gitlab-org/gitlab-ce!25706
2019-03-07 15:57:06 +00:00
Sean McGivern 482b86ae15 Merge branch 'sh-rugged-tree-entries' into 'master'
Bring back Rugged implementation of GetTreeEntries

See merge request gitlab-org/gitlab-ce!25674
2019-03-07 15:28:42 +00:00
Stan Hu 2b86f45c5c Merge branch 'fix-sidekiq-process-group-killing' into 'master'
Fix Sidekiq process group killing

See merge request gitlab-org/gitlab-ce!25866
2019-03-07 13:18:41 +00:00
Nick Thomas 12bc7e0bab
Fix Sidekiq process group killing 2019-03-07 12:37:59 +00:00
Stan Hu 9d3e413aa7 Bring back Rugged implementation of TreeEntry
This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20099/diffs

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_tree_entry` to activate the Rugged method.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
2019-03-07 04:33:57 -08:00
Stan Hu 2c4cb7a6a8 Bring back Rugged implementation of GetTreeEntries
This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20343.

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_tree_entries` to activate the Rugged method.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
2019-03-07 04:29:51 -08:00
Douwe Maan 6cfa5ee536 Merge branch 'expand-diff-to-full-file' into 'master'
Expand diff to entire file

Closes #19054

See merge request gitlab-org/gitlab-ce!24406
2019-03-07 11:33:15 +00:00
Lin Jen-Shin ca402c1aef Merge branch '58613-protected-branches-error' into 'master'
Allow protected branch creation for empty project

Closes #58613

See merge request gitlab-org/gitlab-ce!25834
2019-03-07 09:42:26 +00:00
Tim Zallmann d07919de90 Moved all emojis to the public folder
Created new emojis map in public folder

Renamed folder to emojis

Loading now the emojis from Localstorage or from Server

Moved all emojis to the public folder

Loading the emojis.json file now through AJAX

Loads now the map in the web element instead when building the emoji tag

Updated the custom Element Setup to modern method

Fixed Emoji Karma Specs for async loading

Loading now the emojis from Localstorage or from Server

Loads now the map in the web element instead when building the emoji tag

Fixed problem with FIXTURE_PATH for emojis fixtures

Fixes Linting Error in gemojione.rake

Fixed Emoji Karma Specs

Fix static type check in gemojione and check if already registered

Testing if the Emoji Support Check is failing Rspec

Change of CLass Name, returning true on check to test

Fixes failing Emoji RSpec Tests

Moved Emojis into public/-/emojis/1/

Fixed Linting Errors in gl_emoji

Fix to fixtures creation for emojis

Fixed path spec for new subdirectory -/emojis

Optimized emojis.json output

Fix for Emoji Spec failure due to unicode dataset

Better catch handling for emojis
2019-03-07 09:33:03 +00:00
Patrick Bajao 461e397969 Move empty_repo check on its own 2019-03-07 16:57:01 +08:00
Patrick Bajao 333097d765 Allow protected branch creation for empty project 2019-03-07 12:47:31 +08:00
Patrick Bajao e371520f46 Allow protected branch creation via web and API
This commit includes changes to add `UserAccess#can_create_branch?`
which will check whether the user is allowed to create a branch even
if it matches a protected branch.

This is used in `Gitlab::Checks::BranchCheck` when the branch name
matches a protected branch.

A `push_to_create_protected_branch` ability in `ProjectPolicy` has been
added to allow Developers and above to create protected branches.
2019-03-06 12:20:27 +00:00
Phil Hughes b14de8e1f5 Add option to expand diff to full file
The user can also toggle between the diff changes and
the full file diff.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
2019-03-06 15:51:44 +08:00
Stan Hu d11b112664 Merge branch 'fix/gb/fix-bridge-jobs-variables-policy' into 'master'
Fix bridge jobs only/except variables policy

Closes #58199

See merge request gitlab-org/gitlab-ce!25710
2019-03-05 22:27:22 +00:00
Douwe Maan ed41f4e6ea Merge branch 'add_ldap_tls_options' into 'master'
Allow raw `tls_options` to be passed in LDAP configuration

Closes #46391

See merge request gitlab-org/gitlab-ce!20678
2019-03-05 13:17:23 +00:00
John Jarvis 83cb748256 Merge branch 'merge-dev-to-master' into 'master'
Merge dev.gitlab.org master into GitLab.com master

Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787

See merge request gitlab-org/gitlab-ce!25746
2019-03-05 10:28:59 +00:00
Grzegorz Bizon 960101c20b Merge branch 'feature/gb/add-serverless-cicd-template' into 'master'
Simplify CI/CD configuration on serverless projects

Closes #57405

See merge request gitlab-org/gitlab-ce!25523
2019-03-05 09:16:32 +00:00
Stan Hu ad2f711adf Add frozen_string_literal to new files 2019-03-04 23:19:19 -08:00
Shinya Maeda 18889696bd Rename ambiguous association names in Ci::Pipeline
fix it ok

Fix

head pipeline
2019-03-05 11:36:26 +07:00
Yorick Peterse 59db98a0ca
Merge dev master into GitLab.com master 2019-03-04 19:44:46 +01:00
Yorick Peterse 03340f0987 Merge branch 'security-kubernetes-local-ssrf' into 'master'
Block local URLs for Kubernetes integration

See merge request gitlab/gitlabhq!2901
2019-03-04 18:36:50 +00:00
Yorick Peterse 6e1f0852fe Merge branch 'security-osw-stop-linking-to-packages' into 'master'
Stop linking to unrecognized package sources

See merge request gitlab/gitlabhq!2933
2019-03-04 18:36:39 +00:00
Francisco Javier López ebf16ada85 Arbitrary file read via MergeRequestDiff 2019-03-04 18:36:34 +00:00
Stan Hu 5c80bbb33c Merge branch '40396-sidekiq-in-process-group' into 'master'
sidekiq: terminate child processes at shutdown

See merge request gitlab-org/gitlab-ce!25669
2019-03-04 18:05:47 +00:00
Nick Thomas f0c52df5e5 sidekiq: terminate child processes at shutdown
Sidekiq jobs frequently spawn long-lived child processes to do work.
In some circumstances, these can be reparented to init when sidekiq is
terminated, leading to duplication of work and strange concurrency
problems.

This commit changes sidekiq so that, if run as a process group leader,
it will forward `INT` and `TERM` signals to the whole process group. If
the memory killer is active, it will also use the process group when
resorting to `kill -9` to shut down.

These changes mean that a naive `kill <pid-of-sidekiq>` will now do the
right thing, killing any child processes spawned by sidekiq, as long as
the process supervisor placed it in its own process group.

If sidekiq isn't a process group leader, this new code is skipped.
2019-03-04 09:06:41 -08:00
Drew Blessing f6350faca1 Allow raw `tls_options` to be passed in LDAP configuration
We've previously exposed ca_file and ssl_version but there are many
possible options that can be used inside tls_options. Instead of
exposing individual ones, simply expose the entire hash so it can
be passed in and we won't have to add things in the future.
2019-03-04 10:27:43 -06:00
Grzegorz Bizon b491e3f91b Freeze abstract templates constant in specs 2019-03-04 21:09:39 +08:00
Grzegorz Bizon d9fb27f42a Make serverless template a valid abstract template 2019-03-04 21:09:38 +08:00
Sean McGivern fd50ba4240 Merge branch 'sh-rugged-find-commit' into 'master'
Bring back Rugged implementation of find_commit

See merge request gitlab-org/gitlab-ce!25477
2019-03-04 09:22:44 +00:00
Felipe Artur 78dc1b58a6 Show commands applied message when promoting issues
Fix 'commands applied' messages not being shown when issue is promoted to epic
using slash commands.
2019-03-04 09:21:47 +00:00
Grzegorz Bizon 4b0036b87e Merge branch 'allow-to-recursively-include' into 'master'
Allow to recursively expand includes

Closes #55937 and #56836

See merge request gitlab-org/gitlab-ce!24356
2019-03-04 09:06:42 +00:00
Grzegorz Bizon 9e12baea1a Add test for evaluating bridge variables policy 2019-03-02 21:04:59 +01:00
Grzegorz Bizon 981c248863 Do not raise when adding undefined variables resource 2019-03-02 15:18:14 +01:00
John Cai 87adc799eb Removing old code path for search_files_by_content
In 11.8, we added a fix for the SearchFilesByContent RPC in gitaly to
send back the response in chunks. However, we kept in the old code path
for backwards compatibility. Now that the change is fully deployed, we
can remove that old codepath.
2019-03-01 15:25:30 -08:00
Stan Hu 4dbf7d66a4 Merge branch '57612-github-importer-ignores-milestone-due_date' into 'master'
Resolve "Github importer ignores Milestone due_date"

Closes #57612

See merge request gitlab-org/gitlab-ce!25182
2019-03-01 21:27:17 +00:00
Stan Hu adf71cfa75 Merge branch '9903-geo-selective-sync-by-namespace-is-broken' into 'master'
Fix GitLab::JsonCache when reading a persisted entry back from the cache

See merge request gitlab-org/gitlab-ce!25587
2019-03-01 17:02:56 +00:00
Douglas Barbosa Alexandre 3977421ed1 Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' into 'master'
Hashed Storage rollback mechanism

See merge request gitlab-org/gitlab-ce!23955
2019-03-01 16:51:49 +00:00
Stan Hu fb6a4e21d4 Bring back Rugged implementation of find_commit
This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20339.

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_find_commit` to activate Rugged paths.

There are also Rake tasks `gitlab:features:enable_rugged` and
`gitlab:features:disable_rugged` to enable/disable these feature
flags altogether.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
2019-03-01 08:45:51 -08:00
Kamil Trzciński e6f6845d64 Merge branch 'refactor-merge-request-between-pipeline-and-build' into 'master'
Add suffix (`_event`) to merge request source

Closes gitlab-ee#9893

See merge request gitlab-org/gitlab-ce!25508
2019-03-01 15:37:14 +00:00
Kamil Trzciński c78861bc42 Allow to recursively expand includes
This change introduces a support for nesting the includes,
allowing to evaluate them in context of the target,
by properly respecting the relative inclusions and user permissions
of another projects, or templates.
2019-03-01 15:55:53 +01:00
Gabriel Mazetto fc0ff92807 Added Rollbacker workers and support on the rake task
Rollback is done similar to Migration for the Hashed Storage.
It also shares the same ExclusiveLease key to prevent both happening
at the same time.

All Hashed Storage related workers now share the same queue namespace
which allows for assigning dedicated workers easily.
2019-03-01 15:49:20 +01:00
Gabriel Mazetto d63380fa93 Refactor ProjectMigrate and ProjectRollback workers
Moved to HashedStorage namespace, and added them to the
`:hashed_storage` queue namespace
2019-03-01 15:49:20 +01:00
Gabriel Mazetto 1592b5830f Adds Rollback functionality to HashedStorage migration
We are adding sidekiq workers and service classes to allow to rollback
a hashed storage migration. There are some refactoring involved as well
as part of the code can be reused by both the migration and the rollback
logic.
2019-03-01 15:49:20 +01:00
Shinya Maeda f62dc67d26 Add suffix for merge request event
Fix

ok

Add spec

Fix

ok

Fix

Add changelog

Fix

Add memoization

a

fix
2019-03-01 22:52:38 +09:00
Nick Thomas adddbf437d
SIGSTP should be SIGTSTP 2019-03-01 10:38:38 +00:00
Douglas Barbosa Alexandre e96f2f248a
Mark cached value as persisted when is an instance of ActiveRecord::Base 2019-02-28 14:11:04 -03:00
Nick Thomas ff431fe076
Revert "Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed"
This reverts commit 006753110a.
2019-02-28 14:45:20 +00:00
Diana Stanley 9c498b10ee Move check for nil due_on into build section of spec 2019-02-27 11:39:27 -08:00
Robert Speicher 177f9ca88b Merge branch 'danger-ignores-gitlab-pot' into 'master'
Danger ignores gitlab.pot

See merge request gitlab-org/gitlab-ce!25594
2019-02-27 18:53:47 +00:00
Rémy Coutable 9983ee55da Merge branch 'fix-misspellings-app' into 'master'
Fix misspellings in app/spec executable lines

See merge request gitlab-org/gitlab-ce!25521
2019-02-27 17:02:57 +00:00