 Dmitriy Zaporozhets
|
9b140b22fb
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
Gemfile.lock
app/helpers/tab_helper.rb
config/routes.rb
db/schema.rb
|
2015-02-04 18:19:22 -08:00 |
|
 Ewan Edwards
|
ad6c372eee
|
Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
|
2015-02-03 15:18:40 -08:00 |
|
|
Dmitriy Zaporozhets
|
3a9682a3d7
|
Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Conflicts:
VERSION
app/helpers/selects_helper.rb
app/models/project.rb
app/views/devise/sessions/new.html.haml
app/views/groups/_settings_nav.html.haml
app/views/layouts/nav/_admin.html.haml
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
config/routes.rb
db/schema.rb
doc/api/projects.md
features/steps/shared/paths.rb
|
2015-01-08 20:37:35 -08:00 |
|
 Ciro Santilli
|
05a6115bc8
|
doc workflow markdown style
- add h1 to README
- move h1 in workflow.md to h2 since the top image acts as h1
- typos
|
2014-12-27 21:43:43 +01:00 |
|
 Marin Jankovski
|
9714608ef6
|
Add rebase merge request documentation, add to changelog.
|
2014-12-01 09:40:56 +01:00 |
|
 Sytse Sijbrandij
|
5d59890b9d
|
Another link to GitHub flow.
|
2014-10-14 13:21:42 +02:00 |
|
 Job van der Voort
|
3386a82d5e
|
add references to gitlab flow article
|
2014-10-07 15:50:23 +02:00 |
|
 Martijn
|
a68a3f65af
|
Edit GitHub Flow url
|
2014-10-02 11:20:54 +02:00 |
|
|
Job van der Voort
|
60a33d649f
|
add gitlab_flow graphic to doc
|
2014-10-01 15:30:29 +02:00 |
|
|
Job van der Voort
|
09352d1f04
|
add new images to gitflow article and space them
|
2014-09-29 16:10:32 +02:00 |
|
|
Job van der Voort
|
841fc4d95e
|
add screenshots to gitlab-flow article
|
2014-09-28 15:47:53 +02:00 |
|
|
Job van der Voort
|
0f35c61dc0
|
add graphs to git-flow article
|
2014-09-28 13:59:33 +02:00 |
|
|
Sytse Sijbrandij
|
6f61cbd162
|
Add wisdom about reverting a revert merge.
|
2014-09-22 13:10:13 +02:00 |
|
|
Sytse Sijbrandij
|
7ecc730a7e
|
Add sentence about tools not being able to compensate for changing commit id's.
|
2014-09-17 09:44:11 +02:00 |
|
|
Sytse Sijbrandij
|
74fecb495c
|
Improve the rebase reasoning.
|
2014-09-17 09:14:12 +02:00 |
|
|
Sytse Sijbrandij
|
8088d22d41
|
Insert at a random point in the changelog to prevent conflicts.
|
2014-09-08 14:11:21 +02:00 |
|
|
Sytse Sijbrandij
|
0bb1e4b5c0
|
Fix problems identified by Achilleas Pipinellis, thanks Achilleas.
|
2014-09-08 13:54:08 +02:00 |
|
|
Sytse Sijbrandij
|
51b6e64db8
|
It's the shell.
|
2014-09-02 11:23:26 +02:00 |
|
|
Sytse Sijbrandij
|
47fdc972b8
|
Four stages.
|
2014-09-02 11:19:27 +02:00 |
|
|
Sytse Sijbrandij
|
54782454f6
|
Adding image descriptions and links as well as consolidating the link and close issues text.
|
2014-09-02 11:14:34 +02:00 |
|
|
Sytse Sijbrandij
|
ca139e8c78
|
Rewrite this section after suggestion from Achilleas.
|
2014-09-01 11:26:47 +02:00 |
|
|
Sytse Sijbrandij
|
fe3762fd0a
|
Fixed items mentioned by Achilleas Pipinellis, thanks.
|
2014-09-01 10:19:22 +02:00 |
|
|
Sytse Sijbrandij
|
1034dbdabf
|
Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen.
|
2014-08-31 10:59:13 +02:00 |
|
|
Sytse Sijbrandij
|
a94ab6b916
|
Fix spelling mistakes, thanks Nico Hamm.
|
2014-08-30 11:35:51 +02:00 |
|
|
Sytse Sijbrandij
|
d8a645ac39
|
Fix grammar mistakes, thanks Angus
|
2014-08-25 17:24:54 +02:00 |
|
|
Sytse Sijbrandij
|
5e9db39823
|
Add article about GitLab flow.
|
2014-08-25 13:16:19 +02:00 |
|