summaryrefslogtreecommitdiff
path: root/doc/workflow
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | Support slash commands in noteable description and notesRémy Coutable2016-08-132-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some important things to note: - commands are removed from noteable.description / note.note - commands are translated to params so that they are treated as normal params in noteable Creation services - the logic is not in the models but in the Creation services, which is the right place for advanced logic that has nothing to do with what models should be responsible of! - UI/JS needs to be updated to handle notes which consist of commands only - the `/merge` command is not handled yet Other improvements: - Don't process commands in commit notes and display a flash is note is only commands - Add autocomplete for slash commands - Add description and params to slash command DSL methods - Ensure replying by email with a commands-only note works - Use :subscription_event instead of calling noteable.subscribe - Support :todo_event in IssuableBaseService Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Refactor description templates documentationAchilleas Pipinellis2016-08-183-13/+1
| | |
* | | Merge branch '2451-fix-mentions-in-issue-updates' into 'master' Robert Speicher2016-08-171-1/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send notification emails when users are newly mentioned in issue or MR edits ## What does this MR do? Introduces "new mention in issue" and "new mention in MR" email notifications. Editing a Mentionable title or description and adding a mention to a user who was not previously mentioned will now send them a notification email, following usual permissions for doing so. ## Why was this MR needed? Issues & MRs may be edited to include mentions to new people. We don't currently send out email notifications of these edits to anyone, although they do create TODOs. This brings email notifications into parity with TODOs. ## What are the relevant issue numbers? Closes #2451 See merge request !5800
| * | Allow people to subscribe to mentions in updated MRs and IssuesNick Thomas2016-08-151-1/+6
| |/ | | | | | | | | | | | | | | | | This slightly changes the semantics of the 'New Issue' and 'New MR' events to include new mentions in edited Mentionables. An alternative would be to introduce 'Issue updated' and 'MR updated' events, but that would lead to questions about why those events were only available to new mentions, and not existing mentions as well, so hold off for now.
* | Load issues and merge requests templates from repositoryFelipe Artur2016-08-163-0/+13
|/
* Merge branch 'convert-shortcuts-md' into 'master' Achilleas Pipinellis2016-08-112-1/+72
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert shortcuts image into markdown ## What does this MR do? Recreates shortcuts page into markdown ## Are there points in the code the reviewer needs to double check? Double check all the shortcuts are correct ## Why was this MR needed? Improve maintainability of this page ## What are the relevant issue numbers? Closes #20160 See merge request !5452
| * Convert shortcuts image into markdownClement Ho2016-08-032-1/+72
| |
* | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-091-3/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check out GH pull requests locally where the source/target branch had been deleted ## What does this MR do? Check out GitHub pull requests where source/target branches that had been deleted locally rather than temporarily restoring them on GitHub using their References API. This helps us to not get rate limited, and allow us to import cross-repository pull requests (those from forks). ## What are the relevant issue numbers? Fixes #15528 Fixes #17766 Fixes #19310 Fixes #19439 Fixes #19998 Fixes #20153 Fixes #20552 Fixes https://gitlab.com/gitlab-com/support-forum/issues/801 #20385 ## Screenshots (if relevant) ## 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) - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [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 !5630
| * | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-3/+0
| |/
* | Simplify feature introduction notesimplify_intro_features_docAchilleas Pipinellis2016-08-086-10/+8
|/ | | | [ci skip]
* Refactor protected branches documentationAchilleas Pipinellis2016-07-225-56/+2
|
* Fix a few nitpicksRémy Coutable2016-07-202-4/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow to disable user request access to groups/projectsFelipe Artur2016-07-202-0/+6
|
* Change URLs to new permissions.md locationAchilleas Pipinellis2016-07-123-3/+3
|
* Add documentation for wildcard protected branches.Timothy Andrew2016-07-054-2/+26
|
* Improve the request / withdraw access button18310-improve-request-access-buttonRémy Coutable2016-07-015-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-301-3/+5
| | | | | | Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Import from Github using Personal Access Tokens.Eric K Idema2016-06-301-5/+11
| | | | | | | | | | | | | This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth.
* Merge branch 'issue_3359_3' into 'master' Douwe Maan2016-06-291-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Insert notification settings dropdown into groups ## Display notification settings dropdown for groups part of #3359 ![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png) ![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png) ![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png) See merge request !4857
| * Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-295-21/+38
| |\
| * \ merge master into issue_3359_3Felipe Artur2016-06-291-0/+2
| |\ \
* | | | optimize png images losslessly using zopflipngPeter Dave Hello2016-06-29100-0/+0
| |_|/ |/| |
* | | Merge branch 'inline-todos-docs' into 'master' Robert Speicher2016-06-225-21/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Todos documentation and screenshots to include new functionality. Updates documentation for todos, includes updated and new screenshots. See also !4502 and #18906 Closes #18923 [ci skip] See merge request !4840
| * | Finish my sentence. [ci skip]Connor Shea2016-06-221-2/+1
| | |
| * | Update Todos documentation and screenshots to include new functionality.inline-todos-docsConnor Shea2016-06-215-21/+39
| | | | | | | | | | | | | | | | | | Add information about manually creating Todos from issue and merge request sidebars. [ci skip]
* | | Merge branch 'doc_refactor_labels' into 'master' Achilleas Pipinellis2016-06-225-17/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
| * | | Move labels documentation to new locationdoc_refactor_labelsAchilleas Pipinellis2016-06-2116-116/+2
| | | | | | | | | | | | | | | | Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
| * | | Add info on tooltipsAchilleas Pipinellis2016-06-211-0/+7
| | | | | | | | | | | | | | | | [ci skip]
| * | | Refactor labels docsAchilleas Pipinellis2016-06-2112-9/+101
| |/ / | | | | | | | | | [ci skip]
* | | Expand on Award Emoji documentation, update/add screenshots. [ci skip]award-emoji-docsConnor Shea2016-06-214-14/+31
|/ /
* | Merge branch ↵Jacob Schatz2016-06-201-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation' into 'master' Documented the up key shortcut ## What does this MR do? Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot. ## Are there points in the code the reviewer needs to double check? The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here? This panel also need to be a little more responsive. Shall I open an issue or include here? Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570. ## Why was this MR needed? Everyone should know about this awesome shortcut. ## What are the relevant issue numbers? Closes #18114. ## Screenshots (if relevant) View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png) ## 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 - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4758
| * | Added shortcut to help shortcuts viewlbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentationLuke "Jared" Bennett2016-06-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated shortcuts.png for docs Updated CHANGELOG Moved CHANGELOG entry updated shortcut docs
* | | Merge branch '18584-document-request-access-feature' into 'master' Achilleas Pipinellis2016-06-2017-1/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document access request to project & group ## What does this MR do? Adds documentation that was missing from !3798. ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome! ## What are the relevant issue numbers? Closes #18584. ## Does this MR meet the acceptance criteria? - [ ] Tests - [ ] 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) /cc @DouweM See merge request !4685
| * | | Update images for the 'Project users' documentation18584-document-request-access-featureRémy Coutable2016-06-1510-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Add documentation for the 'request access to group' featureRémy Coutable2016-06-154-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Add documentation for the 'request access to project' featureRémy Coutable2016-06-154-0/+22
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge master into issue_12758issue_12758Felipe Artur2016-06-171-1/+1
|\ \ \ | |/ /
* | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-0/+0
|\ \ \ | | |/ | |/|
| * | Add notification settings documentation and update screenshotFelipe Artur2016-06-132-2/+4
| |/
* | Implement custom notification level optionsFelipe Artur2016-06-152-2/+4
|/
* Add documentation for the 'only_allow_merge_if_build_succeeds.rb' featureRémy Coutable2016-06-102-0/+11
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>