Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
GitLab Flow
Search
ogom
July 26, 2014
Programming
5
8.8k
GitLab Flow
GitLab with Flow
ogom
July 26, 2014
Tweet
Share
More Decks by ogom
See All by ogom
PicoRuby から始めるたのしい電子工作
ogom
0
1.9k
GraphQL Better Errors
ogom
0
370
Osaka RubyKaigi 02
ogom
0
340
Osaka RubyKaigi 01
ogom
0
210
Contributing to GitLab with OSS Gate
ogom
0
590
DojoCon Japan 2017
ogom
0
140
GDStudy Engage
ogom
1
800
Using Immutable.js with React Redux
ogom
0
150
CoderDojo と オープンソース
ogom
2
500
Other Decks in Programming
See All in Programming
Things You Thought You Didn’t Need To Care About That Have a Big Impact On Your Job
hollycummins
0
180
iOSエンジニア向けの英語学習アプリを作る!
yukawashouhei
0
180
10年もののAPIサーバーにおけるCI/CDの改善の奮闘
mbook
0
790
Back to the Future: Let me tell you about the ACP protocol
terhechte
0
130
クラシルを支える技術と組織
rakutek
0
190
大規模アプリのDIフレームワーク刷新戦略 ~過去最大規模の並行開発を止めずにアプリ全体に導入するまで~
mot_techtalk
0
400
Model Pollution
hschwentner
1
190
エンジニアとして高みを目指す、 利益を生み出す設計の考え方 / design-for-profit
minodriven
23
12k
タスクの特性や不確実性に応じた最適な作業スタイルの選択(ペアプロ・モブプロ・ソロプロ)と実践 / Optimal Work Style Selection: Pair, Mob, or Solo Programming.
honyanya
3
140
フロントエンド開発に役立つクライアントプログラム共通のノウハウ / Universal client-side programming best practices for frontend development
nrslib
7
3.9k
Web Components で実現する Hotwire とフロントエンドフレームワークの橋渡し / Bridging with Web Components
da1chi
3
1.9k
CSC509 Lecture 03
javiergs
PRO
0
330
Featured
See All Featured
Balancing Empowerment & Direction
lara
4
680
Rebuilding a faster, lazier Slack
samanthasiow
84
9.2k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
Writing Fast Ruby
sferik
629
62k
How to Ace a Technical Interview
jacobian
280
24k
Reflections from 52 weeks, 52 projects
jeffersonlam
352
21k
Learning to Love Humans: Emotional Interface Design
aarron
274
40k
Intergalactic Javascript Robots from Outer Space
tanoku
273
27k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
358
30k
How to train your dragon (web standard)
notwaldorf
96
6.3k
A designer walks into a library…
pauljervisheath
209
24k
Facilitating Awesome Meetings
lara
56
6.6k
Transcript
GitLab Flow 62nd Ruby/Rails ษڧձ@ؔ Takashi Ogomori
GitLab with Flow ਐԽ͢ΔGitHubΫϩʔϯΦʔϓϯιʔε։ൃϑϨʔϜϫʔΫ ϚʔδϦΫΤετ ! ͰίϥϘϨʔγϣϯ͔Βͷଚܟͱ৴པ 2/28
Profile " ogom # ogomr GitLab Cookbookͷ։ൃʹߩݙ ΦϨΦϨGitLabͷखॱΛհ GitLab.org Cookbook
· GitLab Cookbook with SSL · 3/28
Commercial GitHub࣮ફೖ ʮPull RequestʹΑΔ։ൃͷมֵʯ 4/28
$ GitLab 7.1.0 5/28
Admin area 6/28
Project 7/28
User 8/28
Group 9/28
Background Jobs 10/28
Project services 11/28
% Flow Styles 12/28
git-flow ෳͷϒϥϯνʹతͱϧʔϧΛ࣋ͨͤͯӡ༻ Branches આ໌ master ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ develop ։ൃ࡞ۀͷத৺ɻfeaturereleaseʹϚʔδ͢Δɻ feature ػೳՃͷ࡞ۀɻdevelop͔Βذͯ͠developʹϚʔδ͢Δɻ
release ϦϦʔεͷ४උ࡞ۀɻdevelop͔Βذͯ͠masterͱdevelopʹϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻmaster͔Βذͯ͠masterͱdevelopʹϚʔδ͢Δɻ & git-flow Cheat Sheet (ຊޠ) 13/28
GitHub Flow ̍ͭͷϒϥϯν(master)ΛϦϦʔεͰ͖Δঢ়ଶʹҡ࣋ͯ͠ӡ༻ Works આ໌ Create a branch master͔Βذͯ͠ɺϒϥϯνΛ࡞͢Δɻ Add
commits ։ൃ࡞ۀͷத৺ɻมߋͷίϛοτΛՃ͢Δɻ Open a Pull Request masterʹϓϧϦΫΤετΛૹ৴͢Δɻ Discuss and Review มߋͷ༰Λٞͯ͠ɺίʔυͷϨϏϡʔΛ͢Δɻ Merge and Deploy masterʹϚʔδͯ͠ɻϦϦʔε͢Δɻ & Understanding the GitHub Flow 14/28
GitLab Flow masterϒϥϯνͱstableϒϥϯνΛฏߦͰ։ൃ͢Δӡ༻ Branches આ໌ master ։ൃ࡞ۀͷத৺ɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ feature ػೳՃͷ࡞ۀɻmaster͔Βذͯ͠masterʹϚʔδ͢Δɻ stable
ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻstable͔Βذͯ͠stableͱmasterʹϚʔδ͢Δɻ & git-flow͔ΒdevelopϒϥϯνΛআ͍ͯGitHub Flowͱෳ߹ & masterɺfeature ͱstableɺhotfix ʹGitHub FlowΛదԠ 15/28
' GitLab Works 16/28
Creating a project 17/28
Create a feature branch 18/28
Add commits 19/28
Open a Merge Request 20/28
Merge and deploy 21/28
Create a stable branch 22/28
Create a hotfix branch 23/28
Add commits 24/28
Open a Merge Request 25/28
Merge and deploy 26/28
Continuous 27/28
Thank You! 28/28