summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add when manifest feature was introduceddocs/manifest-introducedAchilleas Pipinellis2018-08-161-0/+3
|
* Merge branch 'improve-project-manifest-import-docs' into 'master'Achilleas Pipinellis2018-08-163-29/+36
|\ | | | | | | | | Improve project manifest import docs See merge request gitlab-org/gitlab-ce!21253
| * Improve project manifest import docsAchilleas Pipinellis2018-08-163-29/+36
|/
* Merge branch 'zj-remove-repository-languages-feature-gate' into 'master'Nick Thomas2018-08-165-8/+11
|\ | | | | | | | | | | | | Remove feature gates for Repository Languages Closes #50291 See merge request gitlab-org/gitlab-ce!21186
| * Remove feature gates for Repository LanguagesZeger-Jan van de Weg2018-08-165-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | The repository languages feature got introduced through: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480. This MR included feature flags to guard against performance regressions, which allowed GitLab to test it on gitlab.com before the customers would be exposed. .com worked out fine, as shown by our internal monitoring tools, which prompts feature gate removal. Given the docs weren't present yet, these were added too.
* | Merge branch ↵Nick Thomas2018-08-163-3/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master' Resolve "Project deletion may not log audit events during group deletion" Closes #49796 See merge request gitlab-org/gitlab-ce!21162
| * | Fix: Project deletion may not log audit events during group deletion49796-project-deletion-may-not-log-audit-events-during-group-deletionValery Sizov2018-08-163-3/+20
| | |
* | | Merge branch 'gitlab-org/gitlab-ce#41738' into 'master'Fatih Acet2018-08-163-1/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix if-check See merge request gitlab-org/gitlab-ce!20640
| * | | Fix if-checkDicker Max2018-08-163-1/+15
|/ / /
* | | Merge branch 'add-kaniko-docs' into 'master'Achilleas Pipinellis2018-08-162-0/+61
|\ \ \ | | | | | | | | | | | | | | | | Initial kaniko documentation See merge request gitlab-org/gitlab-ce!21216
| * | | Initial kaniko documentationJoshua Lambert2018-08-162-0/+61
|/ / /
* | | Merge branch 'add-rake-command-to-migrate-locally-persisted-archived-traces' ↵Kamil Trzciński2018-08-165-34/+159
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add rake command to migrate archived traces from local storage to object storage Closes #50232 See merge request gitlab-org/gitlab-ce!21193
| * | | Add rake command to migrate archived traces from local storage to object storageShinya Maeda2018-08-165-34/+159
|/ / /
* | | Merge branch 'instance-statistics-docs' into 'master'Marcia Ramos2018-08-1616-71/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Instance statistics docs Closes #49976 See merge request gitlab-org/gitlab-ce!21099
| * | | Instance statistics docsLuke Bennett2018-08-1616-71/+98
|/ / /
* | | Merge branch 'add-ci_archive_traces_cron_worker-to-gitlab-yml' into 'master'Kamil Trzciński2018-08-162-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.example See merge request gitlab-org/gitlab-ce!20583
| * | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.exampleShinya Maeda2018-08-162-0/+8
|/ / /
* | | Merge branch '50101-truncated-job-information' into 'master'Phil Hughes2018-08-164-0/+379
|\ \ \ | | | | | | | | | | | | | | | | Creates a vue component for the top bar with controllers in job log view See merge request gitlab-org/gitlab-ce!21164
| * | | Creates a vue component for the top bar with controllers in job log viewFilipa Lacerda2018-08-164-0/+379
|/ / /
* | | Merge branch '50193-feature-flag-force-enable-auto-devops' into 'master'Kamil Trzciński2018-08-167-28/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable Auto DevOps instance-wide on GitLab.com" Closes #50193 See merge request gitlab-org/gitlab-ce!21136
| * | | Resolve "Enable Auto DevOps instance-wide on GitLab.com"Dylan Griffith2018-08-167-28/+54
|/ / /
* | | Merge branch 'workhorse-6.0.0' into 'master'Douwe Maan2018-08-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Use gitlab-workhorse 6.0.0 See merge request gitlab-org/gitlab-ce!21239
| * | | Use gitlab-workhorse 6.0.0workhorse-6.0.0Jacob Vosmaer2018-08-161-1/+1
| | | |
* | | | Merge branch '50101-empty-state-component' into 'master'Phil Hughes2018-08-163-0/+171
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Creates empty state component for job log view See merge request gitlab-org/gitlab-ce!21195
| * | | | Creates empty state component for job log viewFilipa Lacerda2018-08-163-0/+171
|/ / / /
* | | | Merge branch 'ide-job-top-bar-ui-polish' into 'master'Filipa Lacerda2018-08-162-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved padding of top bar in IDE job trace panel Closes #48059 See merge request gitlab-org/gitlab-ce!21222
| * | | | Improved padding of top bar in IDE job trace panelide-job-top-bar-ui-polishPhil Hughes2018-08-152-0/+6
| | | | | | | | | | | | | | | | | | | | Closes #48059
* | | | | Merge branch 'docs-processes' into 'master'Marcia Ramos2018-08-168-72/+509
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Documentation process at GitLab Closes #46843 See merge request gitlab-org/gitlab-ce!19902
| * | | | Documentation process at GitLabMarcia Ramos2018-08-168-72/+509
|/ / / /
* | | | Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipelineSean McGivern2018-08-161-28/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flag for FindAllRemoteBranches Closes gitaly#1243 See merge request gitlab-org/gitlab-ce!21234
| * | | | Remove feature flag for FindAllRemoteBranchesZeger-Jan van de Weg2018-08-161-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acceptance testing done through: https://gitlab.com/gitlab-org/gitaly/issues/1312 Relatively short AT period, but given its not a hard RPC, nor anything funky is going on, I felt that this was decent enough to remove the feature flag. Closes https://gitlab.com/gitlab-org/gitaly/issues/1243
* | | | | Merge branch 'ide-delete-new-files-state' into 'master'Filipa Lacerda2018-08-163-1/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed deleting new files creating wrong state in IDE Closes #50255 See merge request gitlab-org/gitlab-ce!21225
| * | | | | Fixed deleting new files creating wrong state in IDEide-delete-new-files-statePhil Hughes2018-08-153-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | Closes #50255
* | | | | | Merge branch 'master' into 'master'Stan Hu2018-08-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing html_safe on text messages. See merge request gitlab-org/gitlab-ce!21232
| * | | | | | Added missing html_safe on text messages.Alexander Kutelev2018-08-161-2/+2
|/ / / / / /
* | | | | | Merge branch 'frozen-string-enable-app-mailers' into 'master'Stan Hu2018-08-1519-12/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen in app/mailers/**/*.rb See merge request gitlab-org/gitlab-ce!21147
| * | | | | | Enable frozen in app/mailers/**/*.rbgfyoung2018-08-1519-12/+56
|/ / / / / /
* | | | | | Merge branch 'zj-feature-flag' into 'master'50200-change-diagram-in-ha-infrastructure-gitlab-documentation-gitlab-university-high-availability-on-awsRobert Speicher2018-08-153-2/+135
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Acceptance testing issue template See merge request gitlab-org/gitlab-ce!21156
| * | | | | | Add Acceptance testing issue templateZeger-Jan van de Weg2018-08-153-2/+135
|/ / / / / /
* | | | | | Merge branch 'backport-5986-license-templates' into 'master'Robert Speicher2018-08-1514-42/+277
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Core backports from the Premium license templates feature See merge request gitlab-org/gitlab-ce!21212
| * | | | | | Changes /admin/application_settings to support template repository selection ↵Nick Thomas2018-08-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in EE
| * | | | | | Allow the project_select_tag to specify an initial value and for the ↵Nick Thomas2018-08-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | selection to be clear-able
| * | | | | | Convert the license template API to use the new LicenseTemplateFinderNick Thomas2018-08-153-31/+18
| | | | | | |
| * | | | | | Convert BlobHelper#licenses_for_select to use the new LicenseTemplateFinderNick Thomas2018-08-151-5/+7
| | | | | | |
| * | | | | | Introduce a LicenseTemplate model and LicenseTemplateFinder helperNick Thomas2018-08-154-0/+197
| | | | | | |
| * | | | | | Fix bugs in Gitlab::Template::Finders preventing instances from ↵Nick Thomas2018-08-143-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseTemplate.all from loading content
* | | | | | | Merge branch 'n8rzz/consolidate-specs-testing-emoji-awards' into 'master'Robert Speicher2018-08-155-369/+353
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicate specs testing emoji awards on issues Closes #45238 See merge request gitlab-org/gitlab-ce!21126
| * | | | | | | Combines emoji award spec files into single ↵Nate Geslin2018-08-145-369/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_interacts_with_awards_in_issue_spec Closes: #45238
* | | | | | | | Merge branch 'backport-author-link-style' into 'master'Phil Hughes2018-08-151-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add author-link style from common.scss in EE See merge request gitlab-org/gitlab-ce!21204
| * | | | | | | | Add author-link style from common.scss in EEAnnabel Dunstone Gray2018-08-141-0/+4
| | | | | | | | |
View Lorry Controller Status