summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Project Aliases API documentation3264-update-project-aliases-api-docsPatrick Bajao2019-07-031-5/+11
| | | | | Fix the example for POST /project_aliases since it doesn't need the project_id to be URL encoded.
* Merge branch 'patch-71' into 'master'Evan Read2019-07-031-1/+2
|\ | | | | | | | | Update job_artifacts.md to reflect change: https://gitlab.com/gitlab-org/gitlab-ce/issues/31771 See merge request gitlab-org/gitlab-ce!30175
| * Update job_artifacts.md to reflect change: ↵Afeique Sheikh2019-06-281-1/+2
| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/31771 "Developers should only be able to delete jobs if they own them or are Master"
* | Merge branch 'docs-visibility-setting-gitlab-com' into 'master'Evan Read2019-07-033-0/+22
|\ \ | | | | | | | | | | | | | | | | | | Docs update for visibility restriction on GitLab.com Closes gitlab-ee#12501 See merge request gitlab-org/gitlab-ce!30203
| * | Docs update for visibility restriction on GitLab.comJeremy Watson2019-07-033-0/+22
|/ /
* | Merge branch 'patch-71' into 'master'Evan Read2019-07-031-1/+1
|\ \ | | | | | | | | | | | | Add `--globoff` flag to the curl command for Jobs API. See merge request gitlab-org/gitlab-ce!30118
| * | Add `--globoff` flag to the curl command for Jobs API.Jean-Pierre Huynh2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing command fail in some cases with the following error `curl: (3) [globbing] bad range specification in column 56`. This was found when running cURL from a `python:3.7` container that comes with curl version `7.52.1`. ``` root@91963a56cd8f:/# curl --version curl 7.52.1 (x86_64-pc-linux-gnu) libcurl/7.52.1 OpenSSL/1.0.2r zlib/1.2.8 libidn2/0.16 libpsl/0.17.0 (+libidn2/0.16) libssh2/1.7.0 nghttp2/1.18.1 librtmp/2.3 Protocols: dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 pop3s rtmp rtsp scp sftp smb smbs smtp smtps telnet tftp Features: AsynchDNS IDN IPv6 Largefile GSS-API Kerberos SPNEGO NTLM NTLM_WB SSL libz TLS-SRP HTTP2 UnixSockets HTTPS-proxy PSL ``` This doesn't seem to be an issue with `curl 7.58.0` but it doesn't hurt to have that flag enabled.
* | | Merge branch 'docs-geo-markdown-1' into 'master'Evan Read2019-07-0312-1091/+1092
|\ \ \ | | | | | | | | | | | | | | | | Docs: Clean up markdown spacing in geo docs See merge request gitlab-org/gitlab-ce!30112
| * | | Fix spacing in geo docsMarcel Amirault2019-07-0312-1091/+1092
|/ / / | | | | | | | | | Spacing following lists should be 2 spaces, and 3 for numbered lists
* | | Merge branch 'pl-prometheus-uninstall-button-qa' into 'master'Dan Davison2019-07-032-3/+7
|\ \ \ | | | | | | | | | | | | | | | | Wait for 'Uninstall' when installing Prometheus See merge request gitlab-org/gitlab-ce!30251
| * | | Wait for 'Uninstall' when installing PrometheusPeter Leitzen2019-07-032-3/+7
|/ / / | | | | | | | | | | | | Prometheus is uninstallable so waiting won't see 'Install' at all. We'll see 'Uninstall' instead.
* | | Merge branch 'better-autodevops-customization-documentation' into 'master'Evan Read2019-07-032-31/+38
|\ \ \ | | | | | | | | | | | | | | | | Docs/Comments only: Better autodevops customization documentation See merge request gitlab-org/gitlab-ce!30247
| * | | Add URL comments to Auto DevOps templateDylan Griffith2019-07-032-31/+38
|/ / / | | | | | | | | | | | | This will make it more obvious to anyone looking to customize these files what the source code actually is.
* | | Merge branch 'jwoods06-master-patch-41260' into 'master'Evan Read2019-07-031-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Update doc/user/project/merge_requests/squash_and_merge.md See merge request gitlab-org/gitlab-ce!30103
| * | | Update doc/user/project/merge_requests/squash_and_merge.mdJohn Woods2019-07-031-1/+4
|/ / /
* | | Merge branch 'winh-updateResolvableDiscussionsCounts-typo' into 'master'Clement Ho2019-07-024-15/+20
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in updateResolvableDiscussionsCounts action See merge request gitlab-org/gitlab-ce!30278
| * | | Fix typo in updateResolvableDiscussionsCounts actionWinnie Hellmann2019-07-024-15/+20
|/ / /
* | | Merge branch ↵Kamil Trzciński2019-07-024-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prod' into 'master' Use separate Prometheus metrics dirs in dev/test Closes #63869 See merge request gitlab-org/gitlab-ce!30253
| * | | Use separate Prometheus metrics dirs in dev/test63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prodAleksei Lipniagov2019-07-024-4/+16
| | | | | | | | | | | | | | | | | | | | Store Sidekiq and Web server metrics from Prometheus in separate directories in `development` and `test` environments.
* | | | Merge branch 'use-pg-9.6.11-on-ci' into 'master'Stan Hu2019-07-023-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use PostgreSQL 9.6.11 in CI tests See merge request gitlab-org/gitlab-ce!30270
| * | | | Use PostgreSQL 9.6.11 in CI testsTakuya Noguchi2019-07-033-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the minor version of postgresql for CI Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch '62756-include-user-info-in-access-logs' into 'master'Stan Hu2019-07-022-4/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include username in auth log Closes #62756 See merge request gitlab-org/gitlab-ce!29821
| * | | | | Include user id and username in auth logMayra Cabrera2019-07-022-4/+53
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fetches user based on the value of 'rack.attack.match_discriminator' Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* | | | | Merge branch '50228-deploy-tokens-custom-username' into 'master'Mayra Cabrera2019-07-0213-5/+124
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Custom username for deploy tokens See merge request gitlab-org/gitlab-ce!29639
| * | | | | Add username to deploy tokensKrasimir Angelov2019-07-0213-5/+124
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
* | | | | Merge branch 'master' into 'master'Mayra Cabrera2019-07-021-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Jekyll Pages template: LC_ALL=C.UTF-8 See merge request gitlab-org/gitlab-ce!29907
| * | | | | LC_ALL=C.UTF-8Pat Myron2019-07-021-0/+1
| | | | | |
* | | | | | Merge branch 'unicorn-sampler-fix' into 'master'Kamil Trzciński2019-07-022-6/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start UnicornSampler in master process Closes #63830 See merge request gitlab-org/gitlab-ce!30215
| * | | | | Start UnicornSampler in master processJan Provaznik2019-07-022-6/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | Using `on_master_start` assures that the sampler is started in master process and not in worker processes.
* | | | | Merge branch '12534-clusters' into 'master'Phil Hughes2019-07-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports css class used in EE specs Closes gitlab-ee#12534 See merge request gitlab-org/gitlab-ce!30258
| * | | | | Backports css class used in EE specs12534-clustersFilipa Lacerda2019-07-021-1/+1
| | | | | |
* | | | | | Merge branch '12537-settings-general' into 'master'Phil Hughes2019-07-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/groups/settings/_general.html.haml Closes gitlab-ee#12537 See merge request gitlab-org/gitlab-ce!30257
| * | | | | | Removes EE differences12537-settings-generalFilipa Lacerda2019-07-021-1/+1
| |/ / / / /
* | | | | | Merge branch 'clarify-team-group-stage-labels' into 'master'Mek Stittri2019-07-021-15/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile our team, group label definitions with our organization structure See merge request gitlab-org/gitlab-ce!29714
| * | | | | | Reconcile our team, group label definitions with our organization structureMek Stittri2019-07-021-15/+70
|/ / / / / /
* | | | | | Merge branch '63690-issue-trackers-title' into 'master'Dmitriy Zaporozhets2019-07-0221-102/+490
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use title and description fields for issue trackers Closes #63690 See merge request gitlab-org/gitlab-ce!30096
| * | | | | | Use title and description fields for issue trackers63690-issue-trackers-titleJarka Košanová2019-07-0221-102/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - instead of using properties - backward compatibility has to be kept for now
* | | | | | | Merge branch 'sh-cache-flipper-names-memory-cache' into 'master'Rémy Coutable2019-07-023-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Flipper persisted names directly to local memory storage See merge request gitlab-org/gitlab-ce!30265
| * | | | | | | Cache Flipper persisted names directly to local memory storagesh-cache-flipper-names-memory-cacheStan Hu2019-07-023-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that application settings are no longer dominating network traffic, we see that the Feature#persisted_names is using a significant amount of CPU and network bandwidth for Redis. Move this cache into the thread-local memory storage to reduce Redis overhead.
* | | | | | | | Merge branch 'leipert-prefer-offline-yarn' into 'master'Stan Hu2019-07-023-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Prefer offline install for yarn See merge request gitlab-org/gitlab-ce!30267
| * | | | | | | Prefer offline install for yarnLukas Eipert2019-07-023-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'slaughter-codeowners' into 'master'Paul Slaughter2019-07-021-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @pslaughter to CODEOWNERS See merge request gitlab-org/gitlab-ce!30252
| * | | | | | | Add @pslaughter to CODEOWNERSWinnie Hellmann2019-07-021-2/+2
|/ / / / / / /
* | | | | | | Merge branch '62214-namespaces-storage-statistics-on-database' into 'master'Kamil Trzciński2019-07-0220-6/+719
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Step 2 of #62214: Includes logic to update namespaces storage statistics Closes #62214 See merge request gitlab-org/gitlab-ce!28996
| * | | | | | Includes logic to persist namespace statisticsMayra Cabrera2019-07-0220-6/+719
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add two new ActiveRecord models: - RootNamespaceStoragestatistics will persist root namespace statistics - NamespaceAggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled - Inject into UpdateProjectStatistics concern a new callback that will call an async job to insert a new row onto NamespaceAggregationSchedule table - When a new row is inserted a new job is scheduled. This job will update call an specific service to update the statistics and after that it will delete thee aggregated scheduled row - The RefresherServices makes heavy use of arel to build composable queries to update Namespace::RootStorageStatistics attributes. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows
* | | | | | Merge branch '59177-squash-old-migrations' into 'master'harish-and-cindy-ssl-check-rake-taskharish-and-cindy-ldap-sync-rake-tasksDmitriy Zaporozhets2019-07-02876-22421/+1855
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash old migrations Closes #59177 See merge request gitlab-org/gitlab-ce!30226
| * | | | | | Run the db:rollback-pg CI job from 2018Nick Thomas2019-07-021-1/+1
| | | | | | |
| * | | | | | Remove migrations from setup_postgresqlNick Thomas2019-07-021-14/+0
| | | | | | |
| * | | | | | Remove background migrations for old schemasNick Thomas2019-07-0213-1637/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the assumption that a background migration whose specs need a schema older than 2018 is obsoleted by this migration squash, we can remove both specs and code for those that fail to run in CI as a result of the schema at that date no longer existing. This is true for all but the MigrateStageStatus background migration, which is also used from the MigrateBuildStage background migration.
| * | | | | | Remove migration specs from 201[4567]Nick Thomas2019-07-0246-2948/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the migrations are gone, we don't need these specs either
View Lorry Controller Status