Age | Commit message (Collapse) | Author |
|
|
|
Pass Gitaly token on Ruby gRPC requests
See merge request !12228
|
|
unwrap links without an href
Closes #27645
See merge request !9045
|
|
Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection
Closes #33632
See merge request !12135
|
|
|
|
into 'master'
Do not enable prometheus metrics when metrics folder is missing
See merge request !12263
|
|
|
|
If migrations are pending, make CurrentSettings use existing values and populate missing columns with defaults
See merge request !12253
|
|
repository: index submodules by path
See merge request !10798
|
|
populate missing columns with defaults
master was failing because `ApplicationSetting.create_from_defaults` attempted
to write to a column that did not exist in the database. This occurred in a
`rake db:migrate` task, which was unable to perform the migration that would
have added the missing column in the first place.
In 9.3 RC2, we also had a bug where password sign-ins were disabled because
there were many pending migrations. The problem occurred because
`fake_application_settings` was being returned with an OpenStruct that did not
include the predicate method `signup_enabled?`. As a result, the value would
erroneously return `nil` instead of `true`. This commit uses the values of the
defaults to mimic this behavior.
This commit also refactors some of the logic to be clearer.
|
|
+ Set defaults correctly only for when not in production or staging
+ set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru
Test prometheus metrics unmemoized
|
|
|
|
|
|
Add table for files in merge request diffs
See merge request !12047
|
|
Submodules have a name in the configuration, but this name is simply
the path at which the submodule was initially checked in (by default
-- the name is totally arbitrary). If a submodule is moved, it
retains its original name, but its path changes. Since we discover
submodules inside trees, we have their path but not necessarily their
name.
Make the submodules() function return the submodule hash indexed by
path rather than name, so that renamed submodules can be looked up.
Signed-off-by: David Turner <novalis@novalis.org>
|
|
Show private subgroups if member of parent group
Closes #32135
See merge request !11764
|
|
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.
It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:
* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.
It may have neither, if the diff is empty.
|
|
Rename "Slash commands" to "Quick actions"
Closes #27070
See merge request !11811
|
|
This changes ProjectsFinder#init_collection so it no longer relies on a
UNION. For example, to get starred projects of a user we used to run:
SELECT projects.*
FROM projects
WHERE projects.pending_delete = 'f'
AND (
projects.id IN (
SELECT projects.id
FROM projects
INNER JOIN users_star_projects
ON users_star_projects.project_id = projects.id
INNER JOIN project_authorizations
ON projects.id = project_authorizations.project_id
WHERE projects.pending_delete = 'f'
AND project_authorizations.user_id = 1
AND users_star_projects.user_id = 1
UNION
SELECT projects.id
FROM projects
INNER JOIN users_star_projects
ON users_star_projects.project_id = projects.id
WHERE projects.visibility_level IN (20, 10)
AND users_star_projects.user_id = 1
)
)
ORDER BY projects.id DESC;
With these changes the above query is turned into the following instead:
SELECT projects.*
FROM projects
INNER JOIN users_star_projects
ON users_star_projects.project_id = projects.id
WHERE projects.pending_delete = 'f'
AND (
EXISTS (
SELECT 1
FROM project_authorizations
WHERE project_authorizations.user_id = 1
AND (project_id = projects.id)
)
OR projects.visibility_level IN (20,10)
)
AND users_star_projects.user_id = 1
ORDER BY projects.id DESC;
This query in turn produces a better execution plan and takes less time,
though the difference is only a few milliseconds (this however depends
on the amount of data involved and additional conditions that may be
added).
|
|
Stop using deprecated `path` field on Gitaly messages
See merge request !12112
|
|
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070
Deprecate "chat commands" in favor of "slash commands"
We looked for things like:
- `slash commmand`
- `slash_command`
- `slash-command`
- `SlashCommand`
|
|
Don't return nil for missing objects from parser cache
See merge request !12168
|
|
When a user is authorized to a group, they are also authorized to see all the
ancestor groups and descendant groups.
When a user is authorized to a project, they are authorized to see all the
ancestor groups too.
Closes #32135
See merge request !11764
|
|
This revealed an error in our configuration generation in
gitlab:gitaly:install rake task. The fix is included
|
|
|
|
|
|
Implement diff viewers
Closes #30501 and #19931
See merge request !11777
|
|
Backport EE changes to the Kubernetes service
Closes gitlab-ee#2525
See merge request !12139
|
|
|
|
Raise etag route regex miss
Closes #33106
See merge request !12084
|
|
|
|
Add support for services configuration in .gitlab-ci.yml
See merge request !8578
|
|
Allow to access statuses for external CI services
Closes #30714, #29369, and #15220
See merge request !11176
|
|
|
|
'timestamps_with_timezone'
|
|
This was edited to the request, but this won't work if the data is not
available at the time of setting the key for the first time.
|
|
Add the ability to perform background migrations
See merge request !11854
|
|
|
|
Background migrations can be used to perform long running data
migrations without these blocking a deployment procedure.
See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for
more information.
|
|
|
|
|
|
|
|
Prompt user to create personal access token for Git over HTTP
See merge request !11986
|
|
|
|
Fix visibility when referencing snippets
See merge request !2101
|
|
Move diffable? method from Repository to Diff::File
See merge request !11980
|
|
|
|
|
|
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
|
|
If internal auth is disabled and LDAP is not configured on the instance,
present the user with a message to create a personal access token if his
Git over HTTP auth attempt fails.
|