Commit graph

288 commits

Author SHA1 Message Date
Achilleas Pipinellis
9c2f778cc4 Refactor GitHub importing documentation 2016-09-18 11:26:16 +02:00
Douglas Barbosa Alexandre
260d1e6af5 Update GitHub importer documentation to reflect current importer state 2016-09-18 11:05:25 +02:00
Andrew Smith
05b52e0f5e
Import GitHub release notes
# Conflicts:
#	lib/gitlab/github_import/importer.rb
2016-09-13 14:01:22 +10:00
Achilleas Pipinellis
7d2bd6b91b Merge branch '21857-refactor-merge-requests-documentation' into 'master'
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 
2016-09-05 20:43:45 +00:00
Achilleas Pipinellis
bf00e0f4b2 Add links to new docs in merge_requests.md and workflow/README.md 2016-09-05 18:25:05 +02:00
Achilleas Pipinellis
a8ba5840e0 Move revert_changes.md to new location 2016-09-05 13:46:37 +02:00
Achilleas Pipinellis
14a96a1ad2 Move cherry_pick_changes.md to new location 2016-09-05 13:40:41 +02:00
Achilleas Pipinellis
99e03f80ca Move wip_merge_requests.md to a new location 2016-09-05 13:33:45 +02:00
Achilleas Pipinellis
cbc97870bc Move merge_when_build_succeeds.md to new location 2016-09-05 13:21:22 +02:00
Achilleas Pipinellis
cd93b90f85 Move authorization_for_merge_requests.md to new location 2016-09-05 12:36:14 +02:00
Achilleas Pipinellis
7973a22ff4 Move workflow/merge_requests.md to user/project/merge_requests.md 2016-09-05 12:13:11 +02:00
Achilleas Pipinellis
30b56b160b Move web_editor doc to new location 2016-09-02 13:11:57 +02:00
Patricio Cano
cf37d623e1 Renamed enable_lfs to lfs_enabled for the Project field, and related fixes. 2016-08-30 17:17:45 -05:00
Patricio Cano
0227e98d0d Added CHANGELOG, documentation, and API functionality 2016-08-30 16:17:41 -05:00
Douwe Maan
4c17e1b3db Merge branch 'zj-remove-gitorious' into 'master'
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  

/cc @JobV 

See merge request 
2016-08-25 18:02:39 +00:00
Douwe Maan
bbd9a6fe40 Merge branch 'dz-merge-request-version' 2016-08-25 12:59:21 -05:00
Z.J. van de Weg
4c8e9a8d27 Remove gitorious 2016-08-25 10:10:10 +01:00
Jürgen Steinblock
89fcdbe84c removed redundant word 2016-08-25 04:56:48 +00:00
Achilleas Pipinellis
7b0b241749 Merge branch 'patch-4' into 'master'
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 
2016-08-24 18:19:04 +00:00
Ondřej Čertík
a7bd1c23dd Modify the alias to allow specifying a remote
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.
2016-08-23 13:07:16 -06:00
Ondřej Čertík
d1ed0c76ec Add new lines after backticks and colons 2016-08-23 13:02:16 -06:00
Nick
453bf1543e Fix typo in gitlab_flow.md 2016-08-23 17:02:58 +02:00
Ondřej Čertík
eff3c35410 Update 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 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.
2016-08-22 19:57:43 +00:00
Achilleas Pipinellis
a41cd65e79 Merge branch 'issue-boards-doc' into 'master'
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 
2016-08-22 15:20:27 +00:00
Achilleas Pipinellis
aef158a74d Great refactor of Issue Board docs 2016-08-22 16:09:26 +03:00
Achilleas Pipinellis
c70037752c Change location of slash commands docs 2016-08-22 15:53:09 +03:00
Dmitriy Zaporozhets
9329436deb
Merge branch 'master' into dz-merge-request-version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-22 11:34:41 +03:00
Dmitriy Zaporozhets
6db65143db
Merge branch 'master' into dz-merge-request-version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-19 13:01:58 +03:00
Sean McGivern
aba9cc6f22 Merge branch 'master' into expiration-date-on-memberships 2016-08-18 22:50:28 +01:00
Sean McGivern
883b96ab6a Allow project group links to be expired 2016-08-18 22:45:41 +01:00
Robert Speicher
717366d28d Merge branch '4273-slash-commands' into 'master'
Support slash commands in issues / MR description & comments

See merge request 
2016-08-18 16:41:16 -05:00
Douwe Maan
9aa3edc615 Remove unneeded aliases 2016-08-18 14:29:48 -05:00
Achilleas Pipinellis
163c4f5658 Refactor description templates documentation 2016-08-18 09:13:05 +03:00
Douwe Maan
8b8a4626c6 Fix specs and implement fixes based on failing specs 2016-08-17 17:54:24 -05:00
Robert Speicher
3666f6987e Merge branch '2451-fix-mentions-in-issue-updates' into 'master'
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 

See merge request 
2016-08-17 20:19:11 +00:00
Douwe Maan
e07c27fee4 Merge branch 'master' into 4273-slash-commands
# Conflicts:
#	app/services/issues/create_service.rb
2016-08-16 17:49:53 -05:00
Felipe Artur
2872672945 Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
Dmitriy Zaporozhets
5e95c0b8d2
Merge branch 'master' into dz-merge-request-version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-15 17:27:22 +03:00
Nick Thomas
10af11f4fe Allow people to subscribe to mentions in updated MRs and Issues
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.
2016-08-15 15:16:46 +01:00
Douwe Maan
b2b1b4a422 Prefer /reopen over /open, remove /reassign 2016-08-12 20:23:49 -05:00
Rémy Coutable
f393f2dde0
Simplify the slash commands DSL to store action blocks instead of creating 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>
2016-08-13 00:36:47 +02:00
Rémy Coutable
65349c2212 Make slash commands contextual
- 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>
2016-08-13 00:06:12 +02:00
Rémy Coutable
e021604454 Don't extract slash commands inside blockcode, blockquote or HTML tags
Improve slash command descriptions, support /due tomorrow

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:06:12 +02:00
Rémy Coutable
39f7f63fe9 Add the /title slash command
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:06:12 +02:00
Rémy Coutable
0eea8c8857 Support slash commands in noteable description and notes
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>
2016-08-13 00:05:57 +02:00
Dmitriy Zaporozhets
a8fe213ebb
Add documentation for merge request versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-12 15:40:00 +03:00
Achilleas Pipinellis
87b07f6a65 Merge branch 'convert-shortcuts-md' into 'master'
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  

See merge request 
2016-08-11 05:10:25 +00:00
Douwe Maan
c363629691 Merge branch 'gh-pull-requests' into 'master'
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 

Fixes 

Fixes 

Fixes 

Fixes 

Fixes 

Fixes 

Fixes https://gitlab.com/gitlab-com/support-forum/issues/801



## 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 
2016-08-09 23:26:15 +00:00
Achilleas Pipinellis
689de9c6fb Simplify feature introduction note
[ci skip]
2016-08-08 11:44:55 +03:00
Douglas Barbosa Alexandre
1e736fb527 Allow users to import cross-repository pull requests from GitHub 2016-08-04 17:16:50 -03:00