summaryrefslogtreecommitdiff
path: root/doc/workflow
Commit message (Collapse)AuthorAgeFilesLines
* Change location and refactor issue closing pattern documentationAchilleas Pipinellis2016-09-221-0/+1
| | | | | | | | | Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
* Add docs on Cycle AnalyticsAchilleas Pipinellis2016-09-201-0/+1
| | | | [ci skip]
* Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-202-0/+5
|\ | | | | | | | | | | | | Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
| * updated example img in docsJames Lopez2016-09-201-0/+0
| |
| * modify github import JS and controller so we can now specify a namespace ↵James Lopez2016-09-202-0/+5
| | | | | | | | | | | | | | | | and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
* | Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-192-2/+10
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
* | Revert all changes introduced by ↵Kamil Trzcinski2016-09-192-10/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
* | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-194-35/+94
|\ \ | |/
| * Clarify why GH integration is the preferred importing methodAchilleas Pipinellis2016-09-181-4/+5
| |
| * Refactor GitHub importing documentationAchilleas Pipinellis2016-09-184-44/+92
| |
| * Update GitHub importer documentation to reflect current importer stateDouglas Barbosa Alexandre2016-09-181-0/+10
| |
* | Added CHANGELOG item and documentation.Patricio Cano2016-09-152-2/+10
|/
* Import GitHub release notesAndrew Smith2016-09-131-0/+1
| | | | | # Conflicts: # lib/gitlab/github_import/importer.rb
* Merge branch '21857-refactor-merge-requests-documentation' into 'master' Achilleas Pipinellis2016-09-0525-280/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor merge requests documentation ## What does this MR do? Add more information on merge requests. ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21857 See merge request !6202
| * Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-051-5/+8
| |
| * Move revert_changes.md to new locationAchilleas Pipinellis2016-09-055-64/+1
| |
| * Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-055-52/+1
| |
| * Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-054-13/+1
| |
| * Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-053-15/+1
| |
| * Move authorization_for_merge_requests.md to new locationAchilleas Pipinellis2016-09-051-40/+1
| |
| * Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-057-91/+2
| |
* | Move web_editor doc to new locationAchilleas Pipinellis2016-09-0214-152/+2
|/
* Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-301-5/+5
|
* Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-301-0/+8
|
* Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
| * Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+1
| |
* | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-0/+8
|\ \ | |/ |/|
| * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-221-8/+10
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-193-1/+38
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-159-14/+80
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add documentation for merge request versionsDmitriy Zaporozhets2016-08-122-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | removed redundant wordJürgen Steinblock2016-08-251-1/+1
| | | | |
* | | | | Merge branch 'patch-4' into 'master' Achilleas Pipinellis2016-08-241-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_requests.md with a simpler way to check out a merge request ## What does this MR do? This MR updates `merge_requests.md` with a simpler way to check out a merge request The previous way was put under the "By modifying `.git/config` for a given repository" section. The disadvantage of the old way is that one has to modify `.git/config` for each repository that one uses. The new way was put under the "By adding a git alias" section. One has to create this git alias once, and then it will work from any repository, without having to modify `.git/config` over and over again. ## Are there points in the code the reviewer needs to double check? One should double check that the link provided by the "Check out branch" button in a MR, i.e. https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally, still works. I think it will, since I didn't modify the "Checkout merge requests locally" section name. ## Why was this MR needed? This MR was needed because the old way of checking out a merge request locally requires to modify `.git/config` in all repositories that one has on a computer, which is a tedious task. The new way just requires adding a simple git alias, once. And the `git mr` command then works for all repositories. ## What are the relevant issue numbers? I haven't created an issue for this. ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added (N/A) - Tests - [ ] Added for this feature/bug (N/A) - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5944
| * | | | | Modify the alias to allow specifying a remoteOndřej Čertík2016-08-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the alias should be used as: git mr upstream 5 To check out a MR number 5 from the upstream remote, into a `mr-upstream-5` local branch. Also clarify that the `5` in the merge request is the number shown in GitLab.
| * | | | | Add new lines after backticks and colonsOndřej Čertík2016-08-231-0/+4
| | | | | |
| * | | | | Update merge_requests.md with a simpler way to check out a merge request Ondřej Čertík2016-08-221-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous way was put under the "By modifying `.git/config` for a given repository" section. The disadvantage is that one has to modify `.git/config` for each repository that one uses. The new way was put under the "By adding a git alias" section. One has to create this git alias once, and then it will work from any repository, without having to modify `.git/config` over and over again.
* | | | | | Fix typo in gitlab_flow.mdfix-typo-in-gitlab-flowNick2016-08-231-1/+1
|/ / / / /
* | | | | Merge branch 'issue-boards-doc' into 'master' Achilleas Pipinellis2016-08-221-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for Issue Boards ## What does this MR do? Add documentation for issue boards. ## What are the relevant issue numbers? - Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/17907 - Backend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5548 - Frontend MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5554 See merge request !5713
| * | | | | Great refactor of Issue Board docsAchilleas Pipinellis2016-08-221-0/+1
| | |_|_|/ | |/| | |
* | | | | Change location of slash commands docsAchilleas Pipinellis2016-08-222-31/+1
|/ / / /
* | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-182-0/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-182-0/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| | * | | Remove unneeded aliasesDouwe Maan2016-08-181-20/+20
| | | | |
| | * | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-1/+2
| | | | |
| | * | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-163-0/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/services/issues/create_service.rb
| | * | | | Prefer `/reopen` over `/open`, remove `/reassign`Douwe Maan2016-08-121-3/+3
| | | | | |
| | * | | | Simplify the slash commands DSL to store action blocks instead of creating ↵Rémy Coutable2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods Other improvements: - Ensure slash commands autocomplete doesn't break when noteable_type is not given - Slash commands: improve autocomplete behavior and /due command - We don't display slash commands for note edit forms. - Add tests for reply by email with slash commands - Be sure to execute slash commands after the note creation in Notes::CreateService Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Make slash commands contextualRémy Coutable2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Return only slash commands that make sense for the current noteable - Allow slash commands decription to be dynamic Other improvements: - Add permission checks in slash commands definition - Use IssuesFinder and MergeRequestsFinder - Use next if instead of a unless block, and use splat operator instead of flatten Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve slash command descriptions, support /due tomorrow Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Add the /title slash commandRémy Coutable2016-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status