| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| | |
Link Bitbucket Server from import index page
See merge request gitlab-org/gitlab-ce!22752
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix "rails g migration" not always using migration templates
Closes #52651
See merge request gitlab-org/gitlab-ce!22592
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Normally, this is what's supposed to happen when you invoke `rails g
generate migration`:
1. `Rails.application.load_generators` is called here:
https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129
2. This loads the local `generator_templates` path in
https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69.
However, when metrics are enabled, the application is eager loaded here
in the initializer. This short-circuits the `load_generators` and loads
`ActiveRecord::Generators::MigrationGenerator` automatically, so the
custom path is never loaded properly.
With this change, we skip the initializing of metrics and eager loading
if generators are in use.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Replace tooltip in markdown component with gl-tooltip
See merge request gitlab-org/gitlab-ce!21989
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Reduce merge conflicts in the User model
See merge request gitlab-org/gitlab-ce!22697
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This moves the `where` in the `has_many :keys` association in Project to
the Key model. This allows EE to override this method, instead of
modifying the source code directly.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This moves the `1.hour` constant used as the LDAP sync time to a
separate method. This allows EE to override this method using a module,
instead of directly modifying the source code.
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reserve more RAM for master process in Puma
See merge request gitlab-org/gitlab-ce!22741
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The Puma Worker Killer checks the total RAM used by both the master
and worker processes. Bump the limits to N+1 instead of N workers
to account for this.
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Use CI_COMMIT_REF_SLUG when building assets image
See merge request gitlab-org/gitlab-ce!22756
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* Using CI_COMMIT_REF_NAME fails when the branch or tag contains special
characters
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
CE backport from Added a search bar to `Admin > Geo > Projects`
See merge request gitlab-org/gitlab-ce!22747
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This allows EE code to reuse the search partial and append additional
query parameters to it, and have it preserved when searching.
|
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | |
| | | | | | |
| | | | | | | |
Use merge_db_schema for db/schema.rb conflicts
See merge request gitlab-org/gitlab-ce!22692
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This Gem can be used to automatically resolve merge conflicts in
db/schema.rb. To use it you still need to initialise the configuration,
which can be done by running:
merge_db_schema-init --force
See https://gitlab.com/gitlab-org/release/framework/issues/42 for more
information.
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Add dynamic timer for delayed jobs in job list
See merge request gitlab-org/gitlab-ce!22656
|
| | | | | | | | |
|
|\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
add referenced merge_requests endpoint
Closes #39157
See merge request gitlab-org/gitlab-ce!21806
|
|/ / / / / / / |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fixes automatic URL formatting on Maven Page
See merge request gitlab-org/gitlab-ce!22727
|
| | | | | | | | |
|
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |_|_|/ / /
| |/| | | | | |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Improve markdown and fix links that don't render correctly
See merge request gitlab-org/gitlab-ce!22735
|
| |/ / / / / / |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Improve markdown and fix links that don't render correctly
See merge request gitlab-org/gitlab-ce!22737
|
| |/ / / / / / |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Improve markdown and fix links that don't render correctly
See merge request gitlab-org/gitlab-ce!22738
|
| |/ / / / / / |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Resolve "Filter by `None`/`Any` for milestone in issues/mrs API"
Closes #52382
See merge request gitlab-org/gitlab-ce!22637
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| |/ / / / / / |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Refactor SSH keys docs for Windows clients
Closes #46398 and #46399
See merge request gitlab-org/gitlab-ce!21004
|
| | | | | | | | |
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
|
| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reduce SQL queries needed to load open merge requests
See merge request gitlab-org/gitlab-ce!22709
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The SQL queries and memory allocation in MergeRequests::RefreshService
is dominated by queries for Project and Route loads. On staging, the
absence of an inverse relationship caused Rails to make over 1100
extraneous SQL queries for the www-gitlab-com repository.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
|
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Drop gcp_clusters table
See merge request gitlab-org/gitlab-ce!22713
|