summaryrefslogtreecommitdiff
path: root/doc/workflow
Commit message (Collapse)AuthorAgeFilesLines
...
* | Improve approve MR widgetDmitriy Zaporozhets2015-06-121-0/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-1218-13/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/helpers/tab_helper.rb app/models/merge_request.rb app/views/layouts/nav/_project_settings.html.haml app/views/projects/merge_requests/show/_mr_accept.html.haml doc/api/groups.md
| * Merge branch 'rs-issue-1758' into 'master'Dmitriy Zaporozhets2015-06-111-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update grids for 2FA details Also adds a link to the documentation. Closes #1758 See merge request !795
| | * Fix "Acount" typo in 2FA docsrs-issue-1758Robert Speicher2015-06-101-3/+3
| | | | | | | | | | | | [ci skip]
| * | fix and minify imagesJob van der Voort2015-06-118-4/+4
| | |
| * | move and fix links importing docsJob van der Voort2015-06-1113-4/+4
| |/
| * fixed linksKaren Carias2015-06-101-6/+6
| |
* | Documentation for approval featureDmitriy Zaporozhets2015-06-114-0/+19
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-092-41/+44
|\ \ | |/ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: doc/README.md doc/workflow/README.md
| * Removed link "importing to gitlab" because it's in "Documentation". ↵Karen Carias2015-06-081-8/+7
| | | | | | | | Organized links in alphabetical order.
| * fixed numbersKaren Carias2015-06-081-18/+18
| |
| * fixed numbersKaren Carias2015-06-081-5/+5
| |
| * fixed numbersKaren Carias2015-06-081-4/+4
| |
| * Added info about milestones and wiki pages not imported from BitbucketKaren Carias2015-06-081-23/+26
| |
| * fixed importing linkKaren Carias2015-06-081-17/+17
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-0813-10/+58
|\ \ | |/ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/services/files/base_service.rb app/services/files/create_service.rb app/services/files/delete_service.rb app/services/files/update_service.rb doc/workflow/README.md
| * fix spacing in documentJob van der Voort2015-06-081-8/+5
| |
| * importing documents renewedJob van der Voort2015-06-088-9/+44
| |
| * Merge branch 'master' into 'master'Sytse Sijbrandij2015-06-061-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | Doc: Added FreeOTP to 2FA I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication. See merge request !777
| | * Changed spellingrugk2015-06-061-1/+1
| | |
| | * Escaped(?)rugk2015-06-051-1/+1
| | |
| | * Added free alternative to Google Authenticator (FreeOTP).rugk2015-06-051-1/+3
| | |
| * | Add info about WIP merge requests to docs.wip-mr-docsDouwe Maan2015-06-055-0/+14
| |/
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-057-0/+103
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION app/controllers/admin/application_settings_controller.rb app/controllers/omniauth_callbacks_controller.rb app/controllers/projects/project_members_controller.rb app/helpers/application_settings_helper.rb app/models/user.rb app/services/files/base_service.rb app/views/profiles/accounts/show.html.haml db/schema.rb doc/install/installation.md doc/update/6.x-or-7.x-to-7.11.md doc/workflow/README.md lib/gitlab/markdown/external_issue_reference_filter.rb lib/gitlab/reference_extractor.rb lib/gitlab/upgrader.rb
| * fix typo and add screenshotsJob van der Voort2015-06-033-3/+3
| |
| * Add 2FA docsrs-2fa-docsRobert Speicher2015-06-022-1/+67
| | | | | | | | [ci skip]
| * Adds new section for changing time zone in GitLab configuration file. New ↵Stefan Schweter2015-05-271-3/+15
| | | | | | | | section added for changing time zone in Omnibus installations.
| * small fixKaren Carias2015-05-251-1/+1
| |
| * fixed linkKaren Carias2015-05-221-1/+1
| |
| * Added link to keyboard shortcutsKaren Carias2015-05-221-0/+1
| |
| * test1 imageKaren Carias2015-05-221-1/+1
| |
| * keyboard shortcuts in GitLabKaren Carias2015-05-221-0/+5
| |
| * picture for shortcutskaren Carias2015-05-221-0/+0
| |
| * Link to change your time zone in Gitlab CEKaren Carias2015-05-211-1/+2
| |
| * Added instructions to change time zone in GitLab CEKaren Carias2015-05-211-0/+18
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-05-061-4/+2
|\ \ | |/ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
| * Fixed broken permissions link.Patricio Cano2015-05-051-4/+2
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-156-0/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/controllers/groups/group_members_controller.rb app/controllers/projects/deploy_keys_controller.rb app/controllers/projects/project_members_controller.rb app/models/concerns/mentionable.rb app/models/project.rb app/models/project_team.rb app/models/service.rb app/views/admin/application_settings/_form.html.haml app/views/admin/groups/show.html.haml app/views/groups/group_members/_new_group_member.html.haml config/initializers/1_settings.rb db/schema.rb lib/gitlab/reference_extractor.rb spec/lib/gitlab/reference_extractor_spec.rb
| * Corrected title of forking workflow on the README link.Patricio Cano2015-04-081-1/+1
| |
| * Corrected title of forking workflowPatricio Cano2015-04-071-1/+1
| |
| * Implemented changes suggested by Job.Patricio Cano2015-04-071-7/+8
| |
| * Corrected sentence about GitLab FlowPatricio Cano2015-03-031-1/+3
| |
| * Corrected images pathsPatricio Cano2015-03-031-4/+4
| |
| * Created documentation on how to fork a project.Patricio Cano2015-03-036-0/+34
| |
* | add documentation fileMarc Radulescu2015-03-121-0/+11
| |
* | separate documentation for rebase before mergeMarc Radulescu2015-03-121-0/+1
| |
* | Merge branch 'share-with-group-doc' into 'master'Sytse Sijbrandij2015-03-063-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | Share with group doc Fixes gitlab/gitlabhq#2025 See merge request !321
| * | clarify maximum levelJob van der Voort2015-03-051-2/+2
| | |
| * | share with group documentationJob van der Voort2015-02-193-0/+14
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-03-023-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/helpers/oauth_helper.rb app/helpers/projects_helper.rb app/models/service.rb app/views/devise/shared/_signin_box.html.haml config/gitlab.yml.example db/schema.rb doc/integration/github.md features/project/service.feature lib/gitlab/github_import/client.rb
View Lorry Controller Status