summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrygitaly-version-v1.47.2GitalyBot2019-08-121-0/+5
|
* Update Gitaly version to v1.47.2GitalyBot2019-08-121-1/+1
|
* Merge remote-tracking branch 'dev/master'John T Skarbek2019-08-122-1/+21
|\
| * Update CHANGELOG.md for 12.0.6GitLab Release Tools Bot2019-08-121-0/+4
| | | | | | [ci skip]
| * Update CHANGELOG.md for 11.11.8GitLab Release Tools Bot2019-08-091-0/+8
| | | | | | [ci skip]
| * Update CHANGELOG.md for 12.1.5GitLab Release Tools Bot2019-08-093-10/+8
| | | | | | [ci skip]
| * Merge remote-tracking branch 'dev/pokstad1-master-patch-14984'John T Skarbek2019-08-091-0/+5
| |\
| | * Update Gitaly to v1.53.2 for security fixPaul Okstad2019-08-012-1/+6
| | |
| * | Merge branch 'security-pages-api-token-recovery' into 'master'John Skarbek2019-08-092-1/+6
| |\ \ | | | | | | | | | | | | | | | | Fix gitlab api token recovery See merge request gitlab/gitlabhq!3286
| | * | Fix gitlab api token recoveryVladimir Shushlin2019-08-092-1/+6
| |/ /
* | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Clement Ho2019-08-123-5/+16
|\ \ \ | | | | | | | | | | | | | | | | Internationalize Issue and MR list metadata strings See merge request gitlab-org/gitlab-ce!31677
| * | | Internationalize Issue and MR list metadata stringsBrett Walker2019-08-123-5/+16
|/ / /
* | | Merge branch '65790-highlight' into 'master'Annabel Dunstone Gray2019-08-125-2/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds highlight to collapsible line in job log Closes #65790 See merge request gitlab-org/gitlab-ce!31665
| * | | Adds highlight to collapsible lineFilipa Lacerda2019-08-125-2/+28
| | | | | | | | | | | | | | | | | | | | In the job log adds a highlight when hovering the collapsible line
* | | | Merge branch ↵Paul Slaughter2019-08-124-77/+247
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '65530-add-externalization-and-fix-regression-in-shortcuts-helper-modal' into 'master' Resolve "Add externalization and fix regression in shortcuts helper modal" Closes #65530 See merge request gitlab-org/gitlab-ce!31594
| * | | | Resolve "Add externalization and fix regression in shortcuts helper modal"Thomas Randolph2019-08-124-77/+247
|/ / / /
* | | | Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'Stan Hu2019-08-125-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update GraphicsMagick from 1.3.29 to 1.3.33 See merge request gitlab-org/gitlab-ce!31692
| * | | | Update GraphicsMagick from 1.3.29 to 1.3.33 for CI testsTakuya Noguchi2019-08-125-5/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch '65278-fix-puma-master-counter-wipe' into 'master'Stan Hu2019-08-125-25/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix active metric files being wiped after the app starts See merge request gitlab-org/gitlab-ce!31668
| * | | | | Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipeAleksei Lipniagov2019-08-122-6/+2
| | | | | |
| * | | | | Clean prometheus dir only for master processAleksei Lipniagov2019-08-121-1/+5
| | | | | |
| * | | | | Remove extra blank lineAleksei Lipniagov2019-08-121-1/+0
| | | | | |
| * | | | | Fix metric files being wiped after the app startsAleksei Lipniagov2019-08-123-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we hit our app with the initial request, in `warmup`, some metrics already being created as well as corresponding files. If we do `multiproc_file_dir` cleanup after that, we delete the files from the dir while keeping them in memory which leads to the incorrect behavior: the metric is being updated in in-memory, while is not present in the db, not sent to Prometheus as the result.
* | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Clement Ho2019-08-122-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to v5.15.0 See merge request gitlab-org/gitlab-ce!31551
| * | | | | | Update dependency @gitlab/ui to v5.15.0Lukas Eipert2019-08-082-5/+5
| | | | | | |
* | | | | | | Merge branch 'jv-gitaly-1.58.0' into 'master'Stan Hu2019-08-125-44/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gitaly server and gem to 1.58.0 See merge request gitlab-org/gitlab-ce!31588
| * | | | | | | Update Gitaly server and gem to 1.58.0Jacob Vosmaer2019-08-125-44/+5
|/ / / / / / /
* | | | | | | Merge branch 'georgekoltsov/63408-user-mapping' into 'master'Grzegorz Bizon2019-08-1210-21/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add author lines to project import comments See merge request gitlab-org/gitlab-ce!31579
| * | | | | | | Add code review suggestionsGeorge Koltsov2019-08-121-4/+4
| | | | | | | |
| * | | | | | | Apply code review feedbackGeorge Koltsov2019-08-084-16/+13
| | | | | | | |
| * | | | | | | Update project/import/bitbucket.md docGeorge Koltsov2019-08-071-5/+5
| | | | | | | |
| * | | | | | | Add bitbucket_import/importer_spec.rb specGeorge Koltsov2019-08-074-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace `username` field with `nickname` due to updates in BitBucket Cloud API - Add new imported spec validating addition of `authod_line`
| * | | | | | | Add changelog entryGeorge Koltsov2019-08-071-0/+6
| | | | | | | |
| * | | | | | | Add author lines to project import commentsGeorge Koltsov2019-08-074-5/+13
| | | | | | | |
* | | | | | | | Merge branch 'sh-update-ruby-labkit' into 'master'Robert Speicher2019-08-122-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-labkit to 0.4.2 See merge request gitlab-org/gitlab-ce!31685
| * | | | | | | | Update gitlab-labkit to 0.4.2sh-update-ruby-labkitStan Hu2019-08-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This relaxes the gRPC version so that it can be updated. Also adds cache support for distributed tracing. Full release notes: https://gitlab.com/gitlab-org/labkit-ruby/-/tags
* | | | | | | | | Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' ↵Tim Zallmann2019-08-1210-8/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add BitBucketServerImport project filtering See merge request gitlab-org/gitlab-ce!31420
| * | | | | | | | | Add filter param sanitizationgeorgekoltsov/51260-add-filtering-to-bitbucket-server-importGeorge Koltsov2019-08-123-4/+10
| | | | | | | | | |
| * | | | | | | | | Update import/bitbucket_server.md docsGeorge Koltsov2019-08-123-2/+4
| | | | | | | | | |
| * | | | | | | | | Add BitbucketServerController filtering specGeorge Koltsov2019-08-122-2/+14
| | | | | | | | | |
| * | | | | | | | | Add bitbucket_server/client_spec.rb specGeorge Koltsov2019-08-121-0/+11
| | | | | | | | | |
| * | | | | | | | | Add i18n stringsGeorge Koltsov2019-08-121-0/+3
| | | | | | | | | |
| * | | | | | | | | Add changelog entryGeorge Koltsov2019-08-124-8/+14
| | | | | | | | | |
| * | | | | | | | | Add BitBucketServerImport project filteringGeorge Koltsov2019-08-123-2/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'alipniagov-fix-wiki_can_not_be_created_total-counter' into ↵Thong Kuah2019-08-123-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix :wiki_can_not_be_created_total counter See merge request gitlab-org/gitlab-ce!31673
| * | | | | | | | | Fix :wiki_can_not_be_created_total counteralipniagov-fix-wiki_can_not_be_created_total-counterAleksei Lipniagov2019-08-093-2/+10
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs-correct-new-branch-text-instead-of-lorem-ipsum' into 'master'Achilleas Pipinellis2019-08-121-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Lorem Ipsum with actual screenshot text in docs See merge request gitlab-org/gitlab-ce!31412
| * | | | | | | | | Replace Lorem Ipsum with actual screenshot textdocs-correct-new-branch-text-instead-of-lorem-ipsumRene Verschoor2019-08-021-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '61332-web-ide-mr-branch-dropdown-closes-unexpectedly' into ↵Kushal Pandya2019-08-124-31/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Web IDE MR/branch dropdown closes unexpectedly" Closes #61332 See merge request gitlab-org/gitlab-ce!31523
| * | | | | | | | | | Reduce the default height of MR/branch dropdowns61332-web-ide-mr-branch-dropdown-closes-unexpectedlyHimanshu Kapoor2019-08-093-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid having empty areas in the dropdown that occupy unnessary space, I removed the dropdown's min-height and changed its default height in empty state to be same as its loading state (with the spinner).
View Lorry Controller Status