| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee | Robert Speicher | 2015-11-21 | 1 | -5/+4 |
| |\ | |||||
| | * | Merge branch 'award-emoji-doc' into 'master' | Robert Speicher | 2015-11-21 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863 | ||||
| | * | Rewrite HTTP links to force TLS, where possible | Alex Jordan | 2015-11-16 | 1 | -6/+6 |
| | | | |||||
| * | | Merge 8-2-stable into 8-2-stable-ee | Robert Speicher | 2015-11-19 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | Conflicts remaining: - app/controllers/groups/group_members_controller.rb - app/controllers/projects/project_members_controller.rb - app/models/ability.rb - app/models/member.rb - app/models/project.rb | ||||
| * | | Link blog post | Sytse Sijbrandij | 2015-11-07 | 1 | -1/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into ce_upsteram | Valery Sizov | 2015-11-05 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Added missing period. | Derek Robati | 2015-10-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee | Douwe Maan | 2015-07-31 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | Minor styling fixes. | Arno Fleming | 2015-07-25 | 1 | -4/+4 |
| | | | | | | | | | - Link to rendered html instead of markdown source. - Removed typos | ||||
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee | Dmitriy Zaporozhets | 2015-02-04 | 1 | -4/+4 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: Gemfile.lock app/helpers/tab_helper.rb config/routes.rb db/schema.rb | ||||
| | * | Fix a number of discovered typos, capitalization of developer and | Ewan Edwards | 2015-02-03 | 1 | -4/+4 |
| | | | | | | | | | product names, plus a couple of instances of bad Markdown markup. | ||||
| * | | Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce | Dmitriy Zaporozhets | 2015-01-08 | 1 | -21/+21 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | doc workflow markdown style | Ciro Santilli | 2014-12-27 | 1 | -21/+21 |
| | | | | | | | | | | | | | - add h1 to README - move h1 in workflow.md to h2 since the top image acts as h1 - typos | ||||
| * | | Add rebase merge request documentation, add to changelog. | Marin Jankovski | 2014-12-01 | 1 | -0/+10 |
| |/ | |||||
| * | Another link to GitHub flow. | Sytse Sijbrandij | 2014-10-14 | 1 | -1/+1 |
| | | |||||
| * | add references to gitlab flow article | Job van der Voort | 2014-10-07 | 1 | -0/+5 |
| | | |||||
| * | Edit GitHub Flow url | Martijn | 2014-10-02 | 1 | -2/+2 |
| | | |||||
| * | add gitlab_flow graphic to doc | Job van der Voort | 2014-10-01 | 1 | -0/+2 |
| | | |||||
| * | add new images to gitflow article and space them | Job van der Voort | 2014-09-29 | 1 | -17/+51 |
| | | |||||
| * | add screenshots to gitlab-flow article | Job van der Voort | 2014-09-28 | 1 | -10/+10 |
| | | |||||
| * | add graphs to git-flow article | Job van der Voort | 2014-09-28 | 1 | -5/+5 |
| | | |||||
| * | Add wisdom about reverting a revert merge. | Sytse Sijbrandij | 2014-09-22 | 1 | -1/+3 |
| | | |||||
| * | Add sentence about tools not being able to compensate for changing commit id's. | Sytse Sijbrandij | 2014-09-17 | 1 | -0/+1 |
| | | |||||
| * | Improve the rebase reasoning. | Sytse Sijbrandij | 2014-09-17 | 1 | -4/+7 |
| | | |||||
| * | Insert at a random point in the changelog to prevent conflicts. | Sytse Sijbrandij | 2014-09-08 | 1 | -1/+5 |
| | | |||||
| * | Fix problems identified by Achilleas Pipinellis, thanks Achilleas. | Sytse Sijbrandij | 2014-09-08 | 1 | -35/+38 |
| | | |||||
| * | It's the shell. | Sytse Sijbrandij | 2014-09-02 | 1 | -1/+1 |
| | | |||||
| * | Four stages. | Sytse Sijbrandij | 2014-09-02 | 1 | -1/+1 |
| | | |||||
| * | Adding image descriptions and links as well as consolidating the link and ↵ | Sytse Sijbrandij | 2014-09-02 | 1 | -28/+24 |
| | | | | | close issues text. | ||||
| * | Rewrite this section after suggestion from Achilleas. | Sytse Sijbrandij | 2014-09-01 | 1 | -2/+2 |
| | | |||||
| * | Fixed items mentioned by Achilleas Pipinellis, thanks. | Sytse Sijbrandij | 2014-09-01 | 1 | -6/+7 |
| | | |||||
| * | Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen. | Sytse Sijbrandij | 2014-08-31 | 1 | -7/+7 |
| | | |||||
| * | Fix spelling mistakes, thanks Nico Hamm. | Sytse Sijbrandij | 2014-08-30 | 1 | -2/+2 |
| | | |||||
| * | Fix grammar mistakes, thanks Angus | Sytse Sijbrandij | 2014-08-25 | 1 | -3/+3 |
| | | |||||
| * | Add article about GitLab flow. | Sytse Sijbrandij | 2014-08-25 | 1 | -0/+265 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |