summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Re-align CE and EE API docsdocs/api-single-codebaseAchilleas Pipinellis2019-07-032-7/+48
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-031-5/+11
|\
| * Merge branch '3264-update-project-aliases-api-docs' into 'master'Marcia Ramos2019-07-031-5/+11
| |\ | | | | | | | | | | | | Update Project Aliases API documentation See merge request gitlab-org/gitlab-ce!30288
| | * 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 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-031592-27480/+14836
|\ \ \ | |/ /
| * | Merge branch 'docs-api-merge-new-2' into 'master'Achilleas Pipinellis2019-07-0312-135/+1166
| |\ \ | | | | | | | | | | | | | | | | Update api docs to finish aligning EE and CE docs See merge request gitlab-org/gitlab-ce!29852
| | * | Update api docs to finish aligning EE and CE docsMarcel Amirault2019-07-0312-135/+1166
| |/ / | | | | | | | | | | | | | | | Squashing a few commits and continuing work on merging the 12 api docs that have not been ported to CE yet.
| * | Merge branch '44990-remove-old-i' into 'master'Nick Thomas2019-07-036-246/+0
| |\ \ | | | | | | | | | | | | | | | | Remove old migration specs that violate FactoriesInMigrationSpecs See merge request gitlab-org/gitlab-ce!30280
| | * | Remove old migrations and specs44990-remove-old-iHeinrich Lee Yu2019-07-036-246/+0
| | | | | | | | | | | | | | | | | | | | This removes old migrations that violate the FactoriesinMigrationSpecs cop
| * | | Merge branch 'sh-improve-redis-peek' into 'master'Sean McGivern2019-07-035-89/+93
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add Redis call details in Peek performance bar See merge request gitlab-org/gitlab-ce!30191
| | * | | Add Redis call details in Peek performance barsh-improve-redis-peekStan Hu2019-07-025-89/+93
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Redis timings appear to be increasing in production, this change makes it easier to see what exactly which queries are being called and where. This is done by prepending modules in peek-redis to store the call details. This commit redact values for all SET commands (e.g. HMSET, GETSET, etc.).
| * | | Merge branch 'pre-releases-38105a' into 'master'Nick Thomas2019-07-0324-24/+212
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Show Upcoming Status for Releases See merge request gitlab-org/gitlab-ce!29577
| | * | | Show upcoming status for releasesJason Goodman2019-07-0324-24/+212
| |/ / / | | | | | | | | | | | | | | | | | | | | Add released_at field to releases API Add released_at column to releases table Return releases to the API sorted by released_at
| * | | Merge branch '32452-multiple-discussions' into 'master'Phil Hughes2019-07-0334-288/+1162
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Multiple discussions per line in merge request diffs" Closes #32452 See merge request gitlab-org/gitlab-ce!28748
| | * | | Rebased and squashed commitsNatalia Tepluhina2019-07-0334-288/+1162
| |/ / / | | | | | | | | | | | | - all commits squashed to make danger review happy
| * | | Merge branch 'slugify' into 'master'Paul Slaughter2019-07-035-8/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Replace slugifyWithHyphens with improved slugify text util See merge request gitlab-org/gitlab-ce!30172
| | * | | Replace slugifyWithHyphens with improved slugify functionLuke Ward2019-07-035-8/+35
| |/ / /
| * | | Merge branch 'jts/backport-doc-update' into 'master'Marin Jankovski2019-07-031-1/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Expound backporting a tad bit See merge request gitlab-org/gitlab-ce!29918
| | * | | Expound backporting a tad bitJohn Skarbek2019-07-031-1/+8
| |/ / / | | | | | | | | | | | | | | | | This bolsters the information in this document, based on questions recently raised in issue: https://gitlab.com/gitlab-org/release/framework/issues/378
| * | | Merge branch '63971-remove-istanbul' into 'master'Kushal Pandya2019-07-033-87/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove istanbul JavaScript package Closes #63971 See merge request gitlab-org/gitlab-ce!30232
| | * | | Remove istanbul JavaScript packageTakuya Noguchi2019-07-023-87/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | Merge branch 'sh-fix-gitaly-specs-failing' into 'master'Jan Provaznik2019-07-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order-dependent Gitaly specs failing Closes #64006 See merge request gitlab-org/gitlab-ce!30282
| | * | | | Fix order-dependent Gitaly specs failingsh-fix-gitaly-specs-failingStan Hu2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `spec/tasks/gitlab/cleanup_rake_spec.rb` preceded any of the Gitaly request specs, it would import the `cleanup.rake` and the global function `limit`. For some reason, the Protobuf implementation would use the global function instead of the getter method. For example: ``` def limit puts "hi" end req = Gitaly::WikiGetAllPagesRequest.new req.send(:limit) hi => nil ``` To fix this problem, access the field value using the [] operator instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64006
| * | | | | Merge branch 'docs-kramdown-warning-1b' into 'master'Evan Read2019-07-0319-66/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix markdown to reduce number of kramdown warnings (part 1b) Closes #64055 See merge request gitlab-org/gitlab-ce!30246
| | * | | | | Fix markdown to reduce number of kramdown warningsMarcel Amirault2019-07-0319-66/+64
| |/ / / / / | | | | | | | | | | | | | | | | | | Add backticks around square brackets, or fix links, as necessary.
| * | | | | Merge branch 'rj-fix-manual-order' into 'master'Kushal Pandya2019-07-033-1/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't let logged out user do manual order See merge request gitlab-org/gitlab-ce!30264
| | * | | | | Don't let logged out user do manual orderrj-fix-manual-orderRajat Jain2019-07-023-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check for logged out user in the manual order so that they don't see an flash message when they try to reorder issues.
| * | | | | | Merge branch 'vue-i18n-js-ide-directory' into 'master'Tim Zallmann2019-07-036-14/+37
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/ide directory See merge request gitlab-org/gitlab-ce!29967
| | * | | | | Vue-i18n: app/assets/javascripts/ide directoryvue-i18n-js-ide-directoryEzekiel Kigbo2019-07-016-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/ide directory
| * | | | | | 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