| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| | |
Expand/collapse close & backlog lists in issue boards
Closes #23917
See merge request !11820
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Persist stages in the database
Closes #26481
See merge request !11790
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
feature/gb/persist-pipeline-stages
* feature/gb/migrate-pipeline-stages: (76 commits)
redesign caching of application settings
Fix binary encoding error on MR diffs
Fix missing tooltip and ARIA labels for accessibility
Add info on using self-signed certs with Registry
Actually clean gitlab-test path when TestEnv.set_repo_refs fails
Introduce optimistic locking support via optional parameter last_commit_id on File Update API
Move issuable bulk edit form into a new sidebar.
Add PowerShell to CI variable docs
Responsive environment tables
Accept a username for User-level Events API
Introduce an Events API
Update GitLab Pages to v0.4.3
Allow numeric pages domain
Remove references to old settings location
Resolve "API: Environment info missed"
Fix Projects API spec
Resolve "When changing project visibility setting, change other dropdowns automatically"
Update explanation of job-level variable override to fit example
change headings to improve SEO
backports changed import logic from pull mirroring feature into CE
...
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* master: (524 commits)
Improve user experience around slash commands in instant comments
Fix LFS timeouts when trying to save large files
retryable? is now available for CommitStatus
Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
Fix test failures
Add slugify project path to CI enviroment variables
Fixed typo: craeted -> created
32118 Make New environment empty state btn lowercase
Expose import_status in Projects API
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
Fix test failures
Allow manual bypass of auto_sign_in_with_provider
Fix keys seed
Allow users to be hard-deleted from the API
fixup some classnames and media queries
Enable the Style/PreferredHashMethods cop
Lint our factories creation in addition to their build
Don’t schedule workers from inside transactions
Allow scheduling from after_commit hooks
Forbid Sidekiq scheduling in transactions
...
Conflicts:
app/serializers/pipeline_entity.rb
db/schema.rb
spec/factories/ci/stages.rb
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/services/ci/create_pipeline_service_spec.rb
spec/spec_helper.rb
|
| | | | | |
|
|\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Support descriptions for snippets
Closes #31894
See merge request !11071
|
| | |_|/
| |/| | |
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | | |
backports changed import logic from pull mirroring feature into CE
See merge request !11850
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
ConvDev Index
Closes #30469
See merge request !11377
|
| |/ / / |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add `$CI_ENVIRONMENT_URL` as a job variable
Closes #25680
See merge request !11695
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* upstream/master: (39 commits)
Resolve "Improve Container Registry description"
Add username parameter to gravatar URL
Fix replying to a commit discussion displayed in the context of an MR
Add fog-aliyun as backup storage provider
Add missing specs
Make sure protected can't be null; Test protected!
Update session cookie key name to be unique to instance in development
Just mention which GitLab version is required
Fix data inconsistency issue for old artifacts by moving them to a currently used path
Fix N+1 queries for non-members in comment threads
Fix rubocop in spec/helpers/diff_helper_spec.rb
Merge two items into one in the doc
Only remove FK if it exists
Maintain notes avatar at smaller breakpoint
Fix pipeline schedule value name in documentation
Add test for Project#protected_for?
Update diff discussion position per discussion instead of per note
Display Shared Runner status in Admin Dashboard
Make sure we're loading the fresh variables
Now secret_variables_for would return the variables
...
|
| | | | | | |
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* upstream/master: (251 commits)
Don't match email addresses or foo@bar as user references
Revert "Update GITLAB_SHELL_VERSION"
Update GITLAB_SHELL_VERSION
Add feature toggles through Flipper
Change no_limits to limits
Move includes call to scope
Add GitLab Resources to University
Add Documentation for GIT_CHECKOUT variable
Remove entry variable
Do not try to preload Commits when using Note.includes(:noteable)
Ui improvements for count badges and permission badges
Rename the other jobs
Update jobs_spec for changes from builds_spec
Introduce source to pipeline entity
Update docs related to protected actions
Add changelog for protected branches abilities fix
Ask for an example project for bug reports
Center loading spinner in issuable filters
Fix chat commands specs related to protected actions
Fix builds controller specs related to protected actions
...
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
# Conflicts:
# db/schema.rb
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Lint our factories creation in addition to their build
Closes #33139
See merge request !11823
|
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Simplify test&save actions when setting a service integration
Closes #31511
See merge request !11599
|
| | |_|_|/ /
| |/| | | | |
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | | |
# Conflicts:
# db/schema.rb
|
| |/ / / / |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* upstream/master: (89 commits)
Revert "Merge branch 'grpc-1.3.4' into 'master'"
Return nil when looking up config for unknown LDAP provider
Avoid crash when trying to parse string with invalid UTF-8 sequence
Enable Gitaly by default in GitLab 9.3
Don’t create comment on JIRA if link already exists
Disable sub_group_issuables_spec.rb for mysql
Fix math rendering on blob pages
Add changelog
Don't allow to pass a user to ProjectWiki#http_url_to_repo
Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
Fix bottom padding for build page
Fix /unsubscribe slash command creating extra todos
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Update looks job log
'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
Fix spec for Members::AuthorizedDestroyService
31616-add-uptime-of-gitlab-instance-in-admin-area
Set head pipeline when creating merge requests
Create a separate helper to check if we show particular tab on a search page
Add performance deltas between app deployments on Merge Request widget
...
|
| |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | | |
Rework project authorizations and nested groups for better performance
See merge request !10885
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | | |
# Conflicts:
# db/schema.rb
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix terminals support for Kubernetes service
Closes #31754
See merge request !11653
|
| | | |_|/
| | |/| |
| | | | |
| | | | | |
It was broken, because we introduced a default namespace, which was not used by terminal methods.
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Implement Web Hooks calls logging
Closes #17848
See merge request !11027
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* implemented logging of project and system web hooks
* implemented UI for user area (project hooks)
* implemented UI for admin area (system hooks)
* implemented retry of logged webhook
* NOT imeplemented log remover
|
| | |_|/
| |/| |
| | | |
| | | |
| | | | |
otherwise we'll have to use `user.reload` in the specs to get the
current rss_token value.
|
|/ / / |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Add transient head_pipeline_of to pipeline factories
See merge request !11566
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Squashed commit of the following:
commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f
Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Mon Apr 17 17:28:44 2017 +0900
Add fix
commit 09610eebdf22ad048812bb86022504b2ad917e19
Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Mon Apr 17 17:03:49 2017 +0900
Add trace test
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix: Deleting an invited member causes 500 error
Closes #32504
See merge request !11481
|
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Sometimes, new references are not retrieved when a `git fetch` is called
in a bare repos. The easiest solution is to cleanup the test repos and
retry in this case. This only happens when a new ref is added to
TestEnv::BRANCH_SHA or TestEnv::FORKED_BRANCH_SHA.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|/ /
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
| |
| |
| |
| |
| |
| | |
Rename `build_events` to `job_events`
Closes #31620
See merge request !11287
|
| |
| |
| | |
This reverts merge request !11287
|
|/ |
|
|
|
|
|
|
|
| |
Enforced by the database, and no callbacks need to be called.
Combined with 7b9b2c6099 and 294a8b8a6d this resolves
gitlab-org/gitlab-ce#31799
|
|
|
|
|
|
| |
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|