summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update project and group labels empty stateGeorge Tsiolis2018-11-024-5/+13
|
* Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'Evan Read2018-11-011-1/+2
|\ | | | | | | | | Link Bitbucket Server from import index page See merge request gitlab-org/gitlab-ce!22752
| * Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docsStan Hu2018-11-011-1/+2
| |
* | Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix "rails g migration" not always using migration templates Closes #52651 See merge request gitlab-org/gitlab-ce!22592
| * | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-013-10/+15
|\ \ \ | | | | | | | | | | | | | | | | Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
| * | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-313-10/+15
| | | |
* | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697
| * | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'sh-bump-puma-memory-limits' into 'master'Robert Speicher2018-11-011-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reserve more RAM for master process in Puma See merge request gitlab-org/gitlab-ce!22741
| * | | | | Reserve more RAM for master process in Pumash-bump-puma-memory-limitsStan Hu2018-11-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'fix-for-assets-image' into 'master'Stan Hu2018-11-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CI_COMMIT_REF_SLUG when building assets image See merge request gitlab-org/gitlab-ce!22756
| * | | | | | Use CI_COMMIT_REF_SLUG when building assets imagefix-for-assets-imageIan Baum2018-11-011-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Using CI_COMMIT_REF_NAME fails when the branch or tag contains special characters
* | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport from Added a search bar to `Admin > Geo > Projects` See merge request gitlab-org/gitlab-ce!22747
| * | | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE code to reuse the search partial and append additional query parameters to it, and have it preserved when searching.
* | | | | | | Merge branch 'db-schema-merge-conflicts' into 'master'Robert Speicher2018-11-011-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Use merge_db_schema for db/schema.rb conflicts See merge request gitlab-org/gitlab-ce!22692
| * | | | | | Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-013-3/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
| * | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-013-3/+24
| | | | | | | |
* | | | | | | | Merge branch 'related_mrs' into 'master'Douglas Barbosa Alexandre2018-11-014-0/+184
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add referenced merge_requests endpoint Closes #39157 See merge request gitlab-org/gitlab-ce!21806
| * | | | | | | add related merge request endpointHelmut Januschka2018-11-014-0/+184
|/ / / / / / /
* | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-11-011-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes automatic URL formatting on Maven Page See merge request gitlab-org/gitlab-ce!22727
| * | | | | | | Fixes automatic URL formattingLyle Kozloff2018-10-311-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-0112-28/+142
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix testsHeinrich Lee Yu2018-11-016-33/+40
| | | | | | | |
| * | | | | | | Add changelog entryHeinrich Lee Yu2018-11-011-0/+5
| | | | | | | |
| * | | | | | | Add testsHeinrich Lee Yu2018-11-013-4/+46
| | | | | | | |
| * | | | | | | Add documentationHeinrich Lee Yu2018-11-012-17/+17
| | | | | | | |
| * | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| | | | | | | |
| * | | | | | | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs/fix-user-training' into 'master'Achilleas Pipinellis2018-11-011-136/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 correctlydocs/fix-user-trainingEvan Read2018-11-011-136/+131
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-digital-ocean-docker' into 'master'Achilleas Pipinellis2018-11-011-54/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 correctlydocs/fix-digital-ocean-dockerEvan Read2018-11-011-54/+48
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-ux-guide-tips' into 'master'Achilleas Pipinellis2018-11-011-11/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve markdown and fix links that don't render correctly See merge request gitlab-org/gitlab-ce!22738
| * | | | | | | Improve markdown and fix links that don't render correctlydocs/fix-ux-guide-tipsEvan Read2018-11-011-11/+7
| |/ / / / / /
* | | | | | | Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-017-39/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
| * | | | | | | Rearrange code for readabilityHeinrich Lee Yu2018-11-011-16/+18
| | | | | | | |
| * | | | | | | Add changelog entryHeinrich Lee Yu2018-11-011-0/+5
| | | | | | | |
| * | | | | | | Add API docsHeinrich Lee Yu2018-11-012-17/+17
| | | | | | | |
| * | | | | | | Update search bar token for None and AnyHeinrich Lee Yu2018-11-011-2/+2
| | | | | | | |
| * | | | | | | Update API to accept None and AnyHeinrich Lee Yu2018-11-013-17/+29
| |/ / / / / /
* | | | | | | Merge branch 'docs/ssh-win' into 'master'Marcia Ramos2018-11-011-92/+151
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor SSH keys docs for Windows clients Closes #46398 and #46399 See merge request gitlab-org/gitlab-ce!21004
| * | | | | | | Refactor SSH keys docs for Windows clientsAchilleas Pipinellis2018-11-011-92/+151
| | | | | | | |
* | | | | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-01111-148/+148
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * | | | | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-01111-148/+148
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-015-2/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce SQL queries needed to load open merge requests See merge request gitlab-org/gitlab-ce!22709
| * | | | | | | | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-305-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge branch 'drop-gcp-cluster-table' into 'master'Andreas Brandl2018-11-013-33/+59
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop gcp_clusters table See merge request gitlab-org/gitlab-ce!22713