| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using ruby interpolation in externalized strings, they can't be
detected. Which means they will never be presented to be translated.
To mix variables into translations we need to use `sprintf`
instead.
Instead of:
_("Hello #{subject}")
Use:
_("Hello %{subject}) % { subject: 'world' }
|
| |\
| |
| |
| |
| | |
Fix transient failure of badge_list_spec.js
See merge request gitlab-org/gitlab-ce!21363
|
| |/ |
|
| |\
| |
| |
| |
| | |
Backport LDAP changes to CE
See merge request gitlab-org/gitlab-ce!21361
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queries' into 'master'
Resolve "Controller Projects::IssuesController#referenced_merge_requests.json executes more than 100 SQL queries"
Closes #43096
See merge request gitlab-org/gitlab-ce!21237
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
As we always call both methods from the controller - and elsewhere we call the
more general method - and one uses all notes and the other uses system notes,
then we should just load the notes and their authors once, and filter on the
Ruby side.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Whether the preloading belongs in the service or the controller is arguable,
here. As the service is only used for one controller action, it seems reasonable
to put it in the service, but that is not a definitive answer.
Adding the preloads for MR project routes here doesn't seem to work, perhaps
because of https://github.com/rails/rails/issues/32140.
|
| | | |
| | |
| | |
| | |
| | | |
Sorting here needs the project routes to be loaded, including the namespace
routes.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
`#referenced_merge_requests` preloaded too many associations. Award emoji, for
instance, are completely unnecessary here.
`#closed_by_merge_requests` had the opposite problem: `#all_references` needs
each item's author, and these weren't preloaded.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These methods don't really need to be on the Issue model. Issue#related_branches
can also be moved to a service, but we can do that in a separate commit.
This commit does not change any behaviour; it just moves code around, renames
the service, and refactors the specs.
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
Finish cleaning up reassigned variables
Closes #49807
See merge request gitlab-org/gitlab-ce!21349
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Fixes doc/development/architecture.md prod links.
See merge request gitlab-org/gitlab-ce!20455
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Speed up diff comparisons by limiting number of commit messages rendered
See merge request gitlab-org/gitlab-ce!21335
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When a diff has a significant number of commits, the previous behavior would
attempt to render the Markdown on all the commit messages but only display
1000 of them. To avoid additional work, we only need to render the Markdown
on the set that is displayed.
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added count for label, assignee, and milestone lists
Closes #48800
See merge request gitlab-org/gitlab-ce!21208
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add public/uploads/tmp to allowed upload paths
Closes #49585
See merge request gitlab-org/gitlab-ce!20942
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When direct_upload is enabled and a for file is being uploaded,
then workhorse uses `public/uploads/tmp` path. If `uploads.storage_path`
i sset to a different directory, then upload fails because
`public/uploads/tmp` is not in allowed paths.
|
| | | | | | |
| | | | | |
| | | | | | |
[ci skip]
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix broken Git over HTTP clones with LDAP users
Closes #50579
See merge request gitlab-org/gitlab-ce!21352
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Due to a regression in !20608, the LDAP authenticator was not being used
unless OmniAuth was enabled. This change allows the LDAP provider to be used
if it is configured regardless of the OmniAuth setting.
Closes #50579
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix wrong commit count in push event payload
Closes #49971
See merge request gitlab-org/gitlab-ce!21338
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixes a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20916.
We now only use the full commit count for the initial push to the default branch.
Otherwise, we rely on the number of commits that we calculated occurred in the push.
The original behavior in 11.1.4:
1. When a new branch is pushed, `@push_commits_count` was set to the total
number of refs available for the branch.
2. For other branches, `@push_commits_count` would remain `nil`.
3. `GitPushService#build_push_data` would build the push data with
`@push_commits_count`.
4. If this were `nil`, it would be set to the right value here:
https://gitlab.com/gitlab-org/gitlab-ce/blob/v11.1.4/lib/gitlab/data_builder/push.rb#L60
Broken behavior:
1. `GitPushService#push_commits_count` is always called.
2. The total number of commits is therefore always equal to the total number of refs available.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49971
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | | |
Improve system hook spec in spec/services/git_push_service_spec.rb
See merge request gitlab-org/gitlab-ce!21347
|
| | | |/ / /
| |/| | | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | | |
Update gitlab-svgs to 1.2.8
See merge request gitlab-org/gitlab-ce!21346
|
| |/ / / /
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Eliminate unnecessary and duplicate system hook fires
Closes #50549
See merge request gitlab-org/gitlab-ce!21337
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Previously `SystemHookPushWorker` would always be called after a push event,
and this would queue a Sidekiq job regardless of whether any system hooks
needed that event. Moreover, another call inside `Project#execute_hooks` would
also fire system hooks if they existed.
This change both removes the duplicate system hook calls. For installations
without system hooks for push events, this change also can save significant
amount of RAM used by Redis.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50549
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added store for file templates in the Web IDE
See merge request gitlab-org/gitlab-ce!21272
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
#47947
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
[QA] Fix a 'superclass must be a Class' error
Closes gitlab-qa#317
See merge request gitlab-org/gitlab-ce!21340
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Avoid nil safe message
See merge request gitlab-org/gitlab-ce!21326
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
while safe_message is nil.
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
while safe_message is nil.
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Bump fog-google to 1.7.1 and google-api-client to 0.23.0
See merge request gitlab-org/gitlab-ce!21295
|
| | | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is needed to support query parameters in `Fog::Storage::Google`.
See https://github.com/fog/fog-google/pull/409.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
'master'
Resolve "Cherry-picking: Confirmation message should include target branch name"
Closes #41441
See merge request gitlab-org/gitlab-ce!20846
|
| | | | | | | | | | |
|
