Commit Graph
1841 Commits
Author SHA1 Message Date
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
Vinnie Okada feeffc4426 Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
2015-03-17 20:53:09 -06:00
Dmitriy Zaporozhets 560a29e660 Merge branch 'replace-linux-with-gnu-linux' into 'master'
Replace linux with gnu linux

To recognize the work of Dr. Stallman.

See merge request !391
2015-03-18 01:26:39 +00:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Dmitriy Zaporozhets c6586b1283 Merge branch 'unicorn-workers' into 'master'
Documentation about unicorn settings.

Helps with https://news.ycombinator.com/item?id=9213180

See merge request !1704
2015-03-17 02:08:51 +00:00
Marin Jankovski b70e5c57c3 Add nodejs dependency to upgrader and upgrade from 7.7 docs 2015-03-16 13:47:21 -07:00
Marin Jankovski 5c9a924fe7 Add nodejs to installation doc. 2015-03-16 13:45:27 -07:00
Sytse Sijbrandij 9269606c94 Documentation about unicorn settings. 2015-03-16 12:09:53 -07:00
Dmitriy Zaporozhets 469d6373d0 Merge branch 'montly_doc_with_next_release_blog_article' into 'master'
Update monthly doc to mention wip blogpost for next release.

See merge request !1697
2015-03-16 17:50:35 +00:00
Dmitriy Zaporozhets 648f38cd98 Merge branch 'fix-restricted-visibility' into 'master'
Restricted visibility levels - bug fix and new feature

This allows admin users to override restricted visibility settings when creating and updating projects and snippets, and moves the restricted visibility configuration from gitlab.yml to the web UI.  See #1903.

## Move configuration location

I added a new section to the application settings page for restricted visibility levels.  Each level has a checkbox, styled with Bootstrap to look like a toggle button.  A checked box means that the level is restricted.  I added a glowing text shadow and changed the background color for checked buttons because the default styles made it hard to distinguish between checked and unchecked.  This image shows the new section with the "Public" box checked:

![restricted_visibility_settings](https://dev.gitlab.org/Okada/gitlabhq/uploads/629562e4313f89b795e81c3bb0f95893/restricted_visibility_settings.png)

## Allow admins to override

To allow admin users to override the restricted visibility levels, I had to remove the `visibility_level` validation from the `Project` class.  The model doesn't know about the `current_user`, which should determine whether the restrictions can be overridden.  We could use the creator in the validation, but that wouldn't work correctly for projects where a non-admin user is the creator and an admin tries to change the project to a restricted visibility level.

The `Project::UpdateService` and `Project::CreateService` classes already had code to determine whether the current user is allowed to use a given visibility level; now all visibility level validation is done in those classes.  Currently, when a non-admin tries to create or update a project using a restricted level, these classes silently set the visibility level to the global default (create) or the project's existing value (update).  I changed this behavior to be more like an Active Model validation, where using a restricted level causes the entire request to be rejected.

Project and personal snippets didn't have service classes, and restricted visibility levels weren't being enforced in the model or the controllers.  The UI disabled radio buttons for restricted levels, but that wouldn't be difficult to circumvent.  I created the `CreateSnippetService` and `UpdateSnippetService` classes to do the same restricted visibility check that the project classes do.  And since I was dealing with snippet visibility levels, I updated the API endpoints for project snippets to allow users to set and update the visibility level.

## TODO

* [x] Add more tests for restricted visibility functionality

cc @sytse @dzaporozhets

See merge request !1655
2015-03-16 17:49:46 +00:00
Stan Hu 37973ef61b Fix typo for HipChat doc: messaging, not message 2015-03-16 09:39:43 -07:00
Stan Hu 055457360c Add HipChat integration documentation as this was a source of confusion 2015-03-16 09:33:18 -07:00
Sytse Sijbrandij a2fb3711f0 Replace linux with GNU/Linux to recognize the work of Dr. Stallman. 2015-03-15 18:06:25 -07:00
Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility
Conflicts:
	db/schema.rb
2015-03-14 10:49:11 -06:00
Marin Jankovski 89d3028b20 Update monthly doc to mention wip blogpost for next release. 2015-03-13 19:00:16 -07:00
Marin Jankovski 141168ad3c Change default number of unicorn workers to three. 2015-03-13 17:14:34 -07:00
Stan Hu affb5b3ff4 Update documentation for object_kind field in Webhook push and tag push Webhooks 2015-03-13 07:48:35 -07:00
Hannes Rosenögger 12f1a42ecc Merge branch 'enhance_markdown_linebreak_docs' into 'master'
Enhance Markdown linebreak docs

The "Line Breaks" section within the Markdown docs was missing an example of creating a line break within a paragraph by ending a line with two spaces.

See merge request !335
2015-03-13 10:25:58 +00:00
Marin Jankovski 35124fd54a Merge branch 'emoji_cheatsheet_fix' into 'master'
Emoji cheatsheet fix

Worked through the help text for emoji to properly reference and use EmojiOne tags. Removed the ninja and reworked the first sentence a bit, as ninja isn't supported by EmojiOne. Should resolve ticket #953.

See merge request !384
2015-03-12 16:38:48 +00:00
Cameron Banga fff34a7f4d Updated help documentation to properly reference EmojiOne. [ci skip] 2015-03-12 10:49:46 -05:00
Marin Jankovski 3f823068e1 Add deploy to ci.gitlab.com to release documents. 2015-03-11 21:11:32 -07:00
Marin Jankovski 66384d7d44 Add a note about building AMI to security doc 2015-03-11 17:50:02 -07:00
Job van der Voort 536d437373 add AMI update step 2015-03-11 17:31:39 +01:00
Dmitriy Zaporozhets ddd381c9a5 Add criteria for requesting CVE 2015-03-09 17:38:42 -07:00
Kuo-Cheng Yeu fc64b3f7b7 remove duplicate right braces ('}') in configuration examples of GitHub,
GitLab, and Google.
2015-03-09 23:20:44 +08:00
Vinnie Okada 285c534185 Allow admins to override restricted visibility
Allow admins to use restricted visibility levels when creating or
updating projects.
2015-03-08 16:10:05 -06:00
Dmitriy Zaporozhets 69d2e1d829 Add UI guide to GitLab development help 2015-03-08 14:56:45 -07:00
Dmitriy Zaporozhets 21d660a591 Merge branch 'web_hook_extend' into 'master'
Web Hook sends email of pusher

See merge request !1630
2015-03-04 21:42:31 +00:00
Valery Sizov 3d9a766d9f Web Hook sends email of pusher 2015-03-04 20:29:25 +02:00
Ewan Edwards fe6fb32fe6 Moved the Gmail integration line into the list of available integrations. 2015-03-04 07:24:36 -08:00
Ewan Edwards f04847a3c7 The "GitLab buttons in Gmail" document was not linked from anywhere
else. It is now linked.
2015-03-04 07:24:12 -08:00
Dmitriy Zaporozhets 4697daf71a Merge branch 'installtion-from-source' into 'master'
Clearly mark it as installation from source.

See merge request !1622
2015-03-03 19:16:52 +00:00
Sytse Sijbrandij 3ff7189738 Clearly mark it as installation from source. 2015-03-03 10:01:49 -08:00
Dmitriy Zaporozhets f850cff417 Update ci setup documenation 2015-03-02 18:34:29 -08:00