Skip to content

Commit f228a6b

Browse files
medvednikovmedvednikov
committed
Update homepage comparison data
1 parent 3285526 commit f228a6b

8 files changed

Lines changed: 519 additions & 122 deletions

File tree

‎static/css/gitly.scss‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,13 +640,19 @@ form {
640640
}
641641

642642
.home-comparison h2 {
643-
margin-bottom: 16px;
643+
margin-bottom: 4px;
644644
padding: 0;
645645
font-size: 24px;
646646
font-weight: 600;
647647
letter-spacing: -0.015em;
648648
}
649649

650+
.home-comparison__updated {
651+
margin-bottom: 16px;
652+
color: $gray-dark;
653+
font-size: 12px;
654+
}
655+
650656
.home-table-wrap {
651657
overflow-x: auto;
652658
border: 1px solid $gray;
@@ -655,7 +661,7 @@ form {
655661

656662
.table-features {
657663
width: 100%;
658-
min-width: 720px;
664+
min-width: 920px;
659665
border-collapse: collapse;
660666
background: $white;
661667
}
@@ -672,7 +678,7 @@ form {
672678
}
673679

674680
.table-features tr > :first-child {
675-
width: 46%;
681+
width: 32%;
676682
text-align: left;
677683
}
678684

‎templates/index.html‎

Lines changed: 59 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h2>%index_main_features</h2>
4949
<section class="home-comparison" aria-labelledby="home-comparison-title">
5050
<div class="home-shell">
5151
<h2 id="home-comparison-title">%index_comparison_title</h2>
52+
<p class="home-comparison__updated">%index_comparison_updated</p>
5253
<div class="home-table-wrap" tabindex="0">
5354
<table class="table-features">
5455
<thead>
@@ -62,114 +63,126 @@ <h2 id="home-comparison-title">%index_comparison_title</h2>
6263
<tbody>
6364
<tr>
6465
<th scope="row">%index_open_source</th>
65-
<td>%index_no</td>
66-
<td>%index_yes</td>
66+
<td>%index_no <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/billing/concepts/enterprise-billing/ghes-license-files">[1]</a></td>
67+
<td>%index_yes (CE / open core) <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/development/licensing/">[2]</a></td>
6768
<td>%index_yes</td>
6869
</tr>
6970
<tr>
7071
<th scope="row">%index_all_open_source</th>
7172
<td>%index_no</td>
72-
<td>%index_no <a href="/open-source">[*]</a></td>
73+
<td>%index_no (EE) <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/development/licensing/">[2]</a></td>
7374
<td>%index_yes</td>
7475
</tr>
7576
<tr>
7677
<th scope="row">%index_min_ram</th>
77-
<td>32 GB <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/enterprise-server/admin/installation/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-aws#minimum-requirements">[0]</a></td>
78-
<td>4 GB <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ee/install/requirements.html#memory">[1]</a></td>
78+
<td>32 GB / 4 vCPU <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/enterprise-server%403.22/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-google-cloud-platform">[3]</a></td>
79+
<td>8 GB %index_minimum<br>16 GB / 8 vCPU %index_baseline <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/install/requirements/">[4]</a></td>
7980
<td>128 MB</td>
8081
</tr>
8182
<tr>
82-
<th scope="row">%index_cheapest_server</th>
83-
<td>$160</td>
84-
<td>$20</td>
85-
<td>$3.50 <a target="_blank" rel="noopener noreferrer" href="https://aws.amazon.com/lightsail/pricing/">[2]</a></td>
83+
<th scope="row">%index_install_size</th>
84+
<td>400 GB + 500 GB = 900 GB <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/enterprise-server%403.22/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/installing-github-enterprise-server-on-google-cloud-platform">[3]</a></td>
85+
<td>~2.5 GB package<br>&ge;40 GB app + DB/repos <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/install/requirements/">[4]</a></td>
86+
<td>~18 MB binary + data</td>
8687
</tr>
8788
<tr>
8889
<th scope="row">%index_works_no_js</th>
89-
<td>%index_partially</td>
90-
<td>%index_no</td>
90+
<td>%index_partially <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/get-started/using-github/supported-browsers">[5]</a></td>
91+
<td>%index_no <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/install/requirements/">[4]</a></td>
9192
<td>%index_yes</td>
9293
</tr>
9394
<tr>
9495
<th scope="row">%index_detailed_lang_stats</th>
95-
<td>%index_no</td>
96-
<td>%index_no</td>
96+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#list-repository-languages">[6]</a></td>
97+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/user/analytics/repository_analytics/">[7]</a></td>
9798
<td>%index_yes</td>
9899
</tr>
99-
<tr>
100-
<th scope="row">%index_install_size</th>
101-
<td>?</td>
102-
<td>3.9 GB <a target="_blank" rel="noopener noreferrer" href="https://gist.github.com/medvednikov/a90fba85e5e2703a7a6270f1adc50dad">[3]</a></td>
103-
<td>&lt;1 MB</td>
104-
</tr>
105-
<tr>
106-
<th scope="row">%index_load_time</th>
107-
<td>3s</td>
108-
<td>2s</td>
109-
<td>0.3s</td>
110-
</tr>
111100
<tr class="table-features__group">
112101
<th colspan="4" scope="colgroup">%index_ci_features_header</th>
113102
</tr>
114103
<tr>
115104
<th scope="row">%index_cpu_cores</th>
116-
<td>2</td>
117-
<td>1</td>
118-
<td>4 - 8</td>
105+
<td>%index_private_repo: 2 vCPU / 8 GB<br>%index_public_repo: 4 vCPU / 16 GB <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/reference/runners/github-hosted-runners">[8]</a></td>
106+
<td>2 vCPU / 8 GB / 30 GB <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/runners/hosted_runners/linux/">[9]</a></td>
107+
<td>%index_runner_dependent</td>
119108
</tr>
120109
<tr>
121110
<th scope="row">FreeBSD</th>
122-
<td>%index_no</td>
123-
<td>%index_no</td>
111+
<td>%index_no <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/reference/runners/self-hosted-runners">[10]</a></td>
112+
<td>%index_yes (%index_self_managed) <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/runner/install/requirements/">[11]</a></td>
124113
<td>%index_yes</td>
125114
</tr>
126115
<tr>
127116
<th scope="row">macOS</th>
128-
<td>%index_yes</td>
129-
<td>%index_no</td>
117+
<td>%index_yes (%index_hosted) <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/reference/runners/github-hosted-runners">[8]</a></td>
118+
<td>%index_yes (%index_self_managed; %index_hosted_beta) <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/runners/hosted_runners/macos/">[12]</a></td>
130119
<td>%index_yes</td>
131120
</tr>
132121
<tr>
133122
<th scope="row">%index_dep_cache</th>
134-
<td>%index_no</td>
135-
<td>%index_no</td>
123+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/reference/workflows-and-actions/dependency-caching">[13]</a></td>
124+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/caching/">[14]</a></td>
136125
<td>%index_yes</td>
137126
</tr>
138127
<tr>
139128
<th scope="row">%index_separate_instance</th>
140-
<td>%index_no</td>
141-
<td>%index_no</td>
129+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/reference/runners/github-hosted-runners">[8]</a></td>
130+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/runners/hosted_runners/linux/">[9]</a></td>
131+
<td>%index_yes</td>
132+
</tr>
133+
<tr>
134+
<th scope="row">%index_ci_interactive_shell</th>
135+
<td>%index_no_builtin</td>
136+
<td>%index_self_managed <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/interactive_web_terminal/">[15]</a></td>
137+
<td>%index_yes</td>
138+
</tr>
139+
<tr>
140+
<th scope="row">%index_ci_automatic_trigger</th>
141+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/how-tos/write-workflows/choose-when-workflows-run/trigger-a-workflow">[16]</a></td>
142+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/pipelines/">[17]</a></td>
142143
<td>%index_yes</td>
143144
</tr>
144145
<tr>
145146
<th scope="row">%index_instant_start</th>
146147
<td>%index_no</td>
147148
<td>%index_no</td>
149+
<td>%index_no</td>
150+
</tr>
151+
<tr>
152+
<th scope="row">%index_ci_manual_cancel</th>
153+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/how-tos/manage-workflow-runs">[18]</a></td>
154+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/jobs/">[19]</a></td>
148155
<td>%index_yes</td>
149156
</tr>
150157
<tr>
151158
<th scope="row">%index_stop_ci</th>
152-
<td>%index_no</td>
153-
<td>%index_no</td>
159+
<td>%index_no &mdash; %index_per_workflow_run <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/how-tos/manage-workflow-runs">[18]</a></td>
160+
<td>%index_yes &mdash; %index_whole_pipeline <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/jobs/">[19]</a></td>
161+
<td>%index_yes</td>
162+
</tr>
163+
<tr>
164+
<th scope="row">%index_ci_auto_cancel</th>
165+
<td>%index_partially &mdash; %index_requires_configuration <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/actions/how-tos/write-workflows/choose-when-workflows-run/control-workflow-concurrency">[20]</a></td>
166+
<td>%index_yes <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/ci/pipelines/settings/">[21]</a></td>
154167
<td>%index_yes</td>
155168
</tr>
156169
<tr>
157170
<th scope="row">%index_logs_storage_time</th>
158-
<td>%index_three_months</td>
159-
<td>%index_three_months</td>
171+
<td>%index_default_ninety_days <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization">[22]</a></td>
172+
<td>%index_indefinite_default <a target="_blank" rel="noopener noreferrer" href="https://docs.gitlab.com/user/gitlab_com/logging/">[23]</a></td>
160173
<td>%index_six_months</td>
161174
</tr>
162175
<tr>
163176
<th scope="row">%index_basic_ci_minutes</th>
164-
<td>3000 <a target="_blank" rel="noopener noreferrer" href="https://docs.github.com/en/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions">[4]</a></td>
165-
<td>10000 <a target="_blank" rel="noopener noreferrer" href="https://about.gitlab.com/pricing/">[5]</a></td>
166-
<td>43200</td>
177+
<td>2,000 min/month (%index_private_repo)<br>%index_public_repos_free <a target="_blank" rel="noopener noreferrer" href="https://github.com/pricing">[24]</a></td>
178+
<td>400 min/month <a target="_blank" rel="noopener noreferrer" href="https://about.gitlab.com/pricing/">[25]</a></td>
179+
<td>43,200 min/month</td>
167180
</tr>
168181
<tr>
169182
<th scope="row">%index_price_per_user</th>
170-
<td>$4</td>
171-
<td>$29</td>
172-
<td>$5</td>
183+
<td>$4/user/month<br>3,000 min/month <a target="_blank" rel="noopener noreferrer" href="https://github.com/pricing">[24]</a></td>
184+
<td>$29/user/month (%index_billed_annually)<br>10,000 min/month <a target="_blank" rel="noopener noreferrer" href="https://about.gitlab.com/pricing/">[25]</a></td>
185+
<td>$5/user/month<br>43,200 min/month</td>
173186
</tr>
174187
</tbody>
175188
</table>

‎translations/cn.tr‎

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ index_feature_pr_no_fork
6969
无需 fork 仓库即可提交拉取请求
7070
-----
7171
index_open_source
72-
开源
72+
开源自托管版本
7373
-----
7474
index_all_open_source
7575
所有功能均为开源
7676
-----
7777
index_min_ram
78-
最小内存
78+
自托管最低内存
7979
-----
8080
index_cheapest_server
8181
最便宜的服务器
8282
-----
8383
index_works_no_js
84-
无需 JS 即可运行
84+
禁用 JavaScript 后仍可运行
8585
-----
8686
index_detailed_lang_stats
87-
详细的语言统计
87+
仓库语言统计
8888
-----
8989
index_install_size
90-
安装大小
90+
自托管最低存储 / 安装
9191
-----
9292
index_load_time
9393
加载 vlang/v 仓库主页的时间
@@ -96,28 +96,91 @@ index_ci_features_header
9696
CI 功能
9797
-----
9898
index_cpu_cores
99-
CPU 核心数
99+
默认托管 Linux runner
100100
-----
101101
index_dep_cache
102102
内置依赖缓存
103103
-----
104104
index_separate_instance
105-
独立实例，支持 SSH 连接
105+
托管任务使用全新隔离环境
106106
-----
107107
index_instant_start
108-
提交/PR 时即时启动
108+
保证“即时”启动 CI
109109
-----
110110
index_stop_ci
111-
轻松停止整个 CI 运行（手动或在新提交/PR/强制推送时）
111+
一键取消提交 / PR / MR 的全部 CI
112112
-----
113113
index_logs_storage_time
114-
CI 日志存储时间
114+
CI 日志保留时间
115115
-----
116116
index_basic_ci_minutes
117-
基础套餐 CI 分钟数
117+
免费套餐托管 CI 配额
118118
-----
119119
index_price_per_user
120-
每用户每月价格
120+
入门付费团队套餐
121+
-----
122+
index_comparison_updated
123+
数据已于 2026 年 9 月根据官方文档核对。
124+
-----
125+
index_ci_interactive_shell
126+
进入托管 CI 机器的交互式 SSH/shell
127+
-----
128+
index_ci_manual_cancel
129+
手动取消单个 workflow / pipeline
130+
-----
131+
index_ci_automatic_trigger
132+
提交 / PR / MR 时自动运行
133+
-----
134+
index_ci_auto_cancel
135+
新提交时自动取消过期 CI
136+
-----
137+
index_private_repo
138+
私有仓库
139+
-----
140+
index_public_repo
141+
公共仓库
142+
-----
143+
index_minimum
144+
最低
145+
-----
146+
index_baseline
147+
基准
148+
-----
149+
index_self_managed
150+
自托管
151+
-----
152+
index_hosted
153+
托管
154+
-----
155+
index_hosted_beta
156+
托管测试版
157+
-----
158+
index_runner_dependent
159+
取决于 runner
160+
-----
161+
index_no_builtin
162+
无内置会话
163+
-----
164+
index_per_workflow_run
165+
按单个 workflow run
166+
-----
167+
index_whole_pipeline
168+
整个 pipeline
169+
-----
170+
index_requires_configuration
171+
需要配置
172+
-----
173+
index_indefinite_default
174+
默认无限期
175+
-----
176+
index_default_ninety_days
177+
默认 90 天
178+
-----
179+
index_public_repos_free
180+
公共仓库免费
181+
-----
182+
index_billed_annually
183+
按年计费
121184
-----
122185
index_yes
123186
是

0 commit comments

Comments
 (0)