| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
This optimises how GroupProjectsFinder builds it collection, producing
simpler and faster queries in the process. It also cleans up the code a
bit to make it easier to understand.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| | |
backports changed import logic from pull mirroring feature into CE
See merge request !11850
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/master: (141 commits)
Add Documentation for GIT_CHECKOUT variable
Ui improvements for count badges and permission badges
Rename the other jobs
Update jobs_spec for changes from builds_spec
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
Fix pipeline retry specs related to protected actions
Fix environment model specs related to protected actions
Fix build factory specs related to protected actions
Fix job play service specs related to protected actions
Fix play status specs related to protected actions
Fix deploy chat command specs for protected actions
Fix environment specs related to protected actions
Use another scope to add the - prefix, feedback:
Fix pipeline processing specs related to protected actions
Fix build entity specs related to protected actions
...
|
| |
| |
| |
| | |
Add a scope to search for the projects that are starred by a certain user.
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
...
|
| |
| |
| |
| |
| |
| |
| | |
This reverts commit c425f366bfa84efab92b5d5e1d0721f16a2890bc, reversing
changes made to 82f6c0f5ac4ed29390ed90592d2c431f3494d93f.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Also introduce Ci::Variable#to_runner_variable to
build up the hash for runner.
|
| | |
|
|/ |
|
|
|
|
|
|
| |
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaee
See merge request !11072
|
| |
| |
| |
| | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Reject more reserved paths
Closes #30272
See merge request !10413
|
| | |
|
| |
| |
| |
| | |
So we can block `objects` only when it is contained in `info/lfs` or `gitlab-lfs`
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
`Project` uses `ProjectPathValidator` which is now a
`NamespaceValidator` that skips the format validation.
That way we're sure we are using the same collection of reserved
paths.
I updated the path constraints to reflect the changes: We now allow
some values that are only used on a top level namespace as a name for
a nested group/project.
|
|/ |
|
|\
| |
| |
| |
| | |
Fix invalidating Project build status cache to often
See merge request !10313
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Protected Tags
Closes #18471
See merge request !10356
|
| |\
| | |
| | |
| | | |
# Conflicts:
# spec/lib/gitlab/import_export/all_models.yml
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
# Conflicts:
# app/assets/javascripts/dispatcher.js
# app/assets/stylesheets/pages/projects.scss
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Makes it clear this is only used in dropdowns, instead of cluttering up Project class. Since we only care about branch names, it is also possible to refactor out a lot of the set/reject logic.
A benchmark on Array/Set subtraction favoured using Arrays. This was with 5000 ‘branches’ and 2000 ‘protections’ to ensure a similar comparison to the commit which introduced using Set for intersection.
Comparison:
array subtraction: 485.8 i/s
set subtraction: 128.7 i/s - 3.78x slower
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | | |
Optimise pipelines.json
See merge request !10462
|
| |\ \ \ |
|
| | |_|/
| |/| | |
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | | |
adds initial microsoft teams integration
See merge request !10412
|
| |/ / |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* master: (192 commits)
Implement new service for creating user
Update sentry-raven 2.0.2 -> 2.4.0
Update webmock 1.21.0 -> 1.24.6
Update spring 1.7.2 -> 2.0.1
Update simplecov 0.12.0 -> 0.14.1
Update pry-rails 0.3.4 -> 0.3.5
Update pry-byebug 3.4.1 -> 3.4.2
Update flay 2.6.1 -> 2.8.1
Remove Tags filter from Projects Explore dropdown
Update capybara-screenshot 1.0.11 -> 1.0.14
Update bullet 5.2.0 -> 5.5.1
Update brakeman 3.4.1 -> 3.6.1
Remove web-console gem
Update better_errors 1.0.1 -> 2.1.1
Display flash message to unauthenticated user when creating new issue
Fix up emoji tests that should have failed :/
Fix RSpec/DescribeSymbol cop violations
Add event limit warning all tabs Cycle Analytics
Adding non_archived scope for counting projects
Resolve "Gitlab administrator cannot create projects in every group"
...
Conflicts:
db/schema.rb
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|