Commit Graph
2231 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0a23688c14 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-21 19:44:52 +03:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master'
Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753
2015-04-21 16:43:54 +00:00
Dmitriy Zaporozhets 58faf307d2 Merge pull request #8510 from koebi001/feature/backup_restore
add environment variable force to the documentation
2015-04-21 19:04:59 +03:00
Douwe Maan c7dc95d1d1 7.10 requires gitlab-shell 2.6.2. 2015-04-21 11:00:26 +02:00
Robert Speicher b595249462 Update markdown docs with latest references
Also, tables! (╯°□°)╯︵ ┻━┻)
2015-04-20 13:01:47 -04:00
Robert Speicher 02809e1cf8 Add more GFM reference examples to docs 2015-04-20 13:01:42 -04:00
Kevin Lyda 644a8437d0 Add link to services api doc. 2015-04-20 10:31:18 +01:00
Patricio Cano f66360859e Merge branch 'add_section_on_SSH_documentation' into 'master'
Add the text "Add your ssh key to an application" with link to http://wiki.eclip…

…se.org/EGit/User_Guide#Eclipse_SSH_Configuration

Add text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration
Add on document http://doc.gitlab.com/ce/ssh/README.html

Reference:
https://twitter.com/elraro21/status/585146770709151747

See merge request !1774
2015-04-17 22:17:19 +00:00
Robin Gauß ac509359b8 Fix link to gitlab.yml.example in paragraph 5 2015-04-17 15:00:14 +02:00
Dmitriy Zaporozhets e24ed47f8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-16 15:29:43 +03:00
Dmitriy Zaporozhets 9042d8d2b2 Merge pull request #9131 from chulkilee/ruby-2.1.6
ruby 2.1.6
2015-04-16 15:27:29 +03:00
Jeroen van Baarsen b18b9a55be Merge pull request #9094 from bbodenmiller/patch-1
update text to reference new location of setting
2015-04-16 14:23:38 +02:00
Job van der Voort 42237e363b update guides for 7.10 2015-04-16 14:16:46 +02:00
Karen Carias 2b6231626a Remove unnecessary file 2015-04-14 22:32:49 +00:00
Karen Carias 9a139fb92d Add application section to SSH documentation 2015-04-14 22:31:26 +00:00
Karen Carias cac6f0e20b Add the text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration 2015-04-14 19:03:57 +00:00
Douwe Maan 55d086ba08 Clarify config var and add to LDAP docs. 2015-04-14 18:17:46 +02:00
Chulki Lee 219a7c45f7 ruby 2.1.6
https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
2015-04-13 22:11:09 -07:00
Ben Bodenmiller efe023e795 document support for inline HTML 2015-04-11 01:38:34 -07:00
Dmitriy Zaporozhets 0d881c7873 Merge pull request #9114 from dreis2211/dreis2211-patch-1
Include creator_id in project info of API
2015-04-10 21:29:10 +03:00
Christoph Dreis d570d0a280 Update API documentation of projects with creator_id 2015-04-10 20:05:01 +02:00
Patricio Cano 6848312f37 Corrected title of forking workflow on the README link. 2015-04-08 16:31:27 -05:00
Dmitriy Zaporozhets e86e101370 Merge branch 'bump_all_versions' into 'master'
Corrected steps for creating a patch release

Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it

See merge request !1754
2015-04-08 11:16:44 +00:00
Dmitriy Zaporozhets 041ce7b303 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-08 14:09:58 +03:00
Jeroen van Baarsen 4cf25eea3a Merge pull request #8546 from h0ru5/patch-1
add necessary dir for uploads in update to 6.7
2015-04-08 10:07:17 +02:00
Patricio Cano 3769e41ad8 Corrected title of forking workflow 2015-04-07 19:37:56 -05:00
Sytse Sijbrandij 4b2aa9cd20 Merge branch 'forking-doc' into 'master'
Documentation on how to fork a project

Added documentation on how to fork a project.

/cc @sabba

See merge request !1623
2015-04-08 00:34:32 +00:00
Patricio Cano a332e7bd02 Implemented changes suggested by Job. 2015-04-07 19:27:04 -05:00
Patricio Cano 56a19b8043 Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it 2015-04-07 15:24:15 -05:00
Ben Bodenmiller 8e512791eb update text to reference new location of setting 2015-04-05 23:27:26 -07:00
Cristian Medina f045490568 Modified lib/api/entities.rb to expose Project class tag_list property to the API
Updated projects.md to show tag_list field when performing GETs
Updated projects_spec.rb to include check for tag_list key in project list
Added changes to the CHANGELOG
2015-04-03 04:35:12 -04:00
Valery Sizov 67c83489ca ability to skip some items in backup 2015-04-02 15:37:50 +03:00
Robert SchillingandJakub Jirutka 9769c2d7fd Fix #6417: users with group permission should be able to create groups via API 2015-03-31 18:32:24 +02:00
Achilleas Pipinellis 64cd7ebf39 Update documentation on issue closing pattern. 2015-03-30 22:31:07 +03:00
Bart Deslagmulder 3cb28de28f Fix typo 'projecti' to 'project' in ssh doc [ci skip] 2015-03-26 20:14:40 +01:00
Dmitriy Zaporozhets ee7364a6e4 Merge branch 'doc_group_permissions' into 'master'
[doc] Groups can be browsable if they contain at least one public project.

See merge request !451
2015-03-26 01:13:27 +00:00
Dmitriy Zaporozhets 6199da0cb4 Merge pull request #8007 from mr-vinn/markdown-tags
Allow HTML tags in user Markdown input
2015-03-25 10:21:03 -07:00
Achilleas Pipinellis ec3f0b0e17 [doc] Groups can be browsable if they contain at least one public project. 2015-03-25 12:18:44 +02:00
Hannes Rosenögger de9d51eea3 Merge branch 'master' into 'master'
Documentation - Markdown - added missing line-break info

as promised, I updated the Markdown documentation with the line-breaks info

See merge request !186
2015-03-25 08:16:16 +00:00
Vinnie Okada 637ca0b388 Merge branch 'master' into markdown-tags 2015-03-22 21:50:28 -06:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +00:00
Vinnie Okada 5f86c08b2a Fix link in patch update guide 2015-03-21 11:29:24 -06:00
Vinnie Okada f5e65e2e50 Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
2015-03-21 09:03:35 -06:00
Marin Jankovski b7229356d5 Change the name of the key used for bitbucket importer. 2015-03-20 15:54:11 -07:00
Vinnie Okada 52bf95ae38 Change HTML sanitization
Use the `SanitizationFilter` class from the html-pipeline gem for inline
HTML instead of calling the Rails `sanitize` method.
2015-03-19 21:24:07 -06:00
Hannes Rosenögger 623f6c5f09 Merge branch 'fix-underscore-notes' into 'master'
Fix cross-references that contain underscores

### What does this MR do?

Cross-references that contain underscores confuse the Markdown renderer and don't work properly. For example:

1. In  `myacct/project_one#456`, add a comment that includes a reference to `myacct/project_two#123`.
2. The comment in `myacct/project_one#456` links correctly.
3. The system note in `myacct/project_two#123` is incorrectly linked as:

`mentioned in issue myacct/projectone#456_`

This MR removes the use of the `_` character in the system notes to prevent Markdown confusion.

See a full discussion in #1160.

### Are there points in the code the reviewer needs to double check?

To preserve backwards compatibility with existing system notes, there is a SQL wildcard match for notes having underscores. This seemed safer than migrating all notes.

### Why was this MR needed?

In an ideal world, the Markdown parser would be able to handle references containing underscores with or without escape sequences. However, there are a number of issues:

1. RedCarpet's parser for emphasis block is pretty dumb: it treats `#` as a word break and thus even the `intra_word_emphasis` flag has no effect.
2. The parser is in C and can't be changed easily.
3. There is no way to insert an escape sequence for emphasis blocks.

The only way around this is to switch to something like CommonMark, which does support escape sequences.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Issue #1160

### Screenshots

Before:

![Screen_Shot_2015-03-19_at_1.39.29_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a1db4b96c0df2f10d9855ed5abe976ca/Screen_Shot_2015-03-19_at_1.39.29_AM.png)

After:

![Screen_Shot_2015-03-19_at_1.39.35_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/189a062c2d19645eec1782ac1f0d4f2f/Screen_Shot_2015-03-19_at_1.39.35_AM.png)

See merge request !385
2015-03-19 21:20:45 +00:00
Dmitriy Zaporozhets c71fa13206 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-19 08:38:06 -07:00
Stan Hu fad71576f9 Fix cross references when usernames, milestones, or project names contain underscores.
Remove emphasis from system notes to avoid Markdown conflicts in names.
2015-03-19 07:07:30 -07:00
Piotr Sampławski 81c06ee53c Fix link to URL auto-linking section in markdown help 2015-03-19 12:59:04 +01:00
Phil Hughes 9ffef6ca1e Changed tis to this 2015-03-19 09:57:27 +00:00