summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Updated upgrader to highlight nodejs as required package [ci skip]Paul Beattie2015-03-221-1/+1
|
* Fix link in patch update guideVinnie Okada2015-03-211-1/+1
|
* Change the name of the key used for bitbucket importer.Marin Jankovski2015-03-201-8/+9
|
* Merge branch 'fix-underscore-notes' into 'master'Hannes Rosenögger2015-03-192-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix cross references when usernames, milestones, or project names contain ↵Stan Hu2015-03-192-2/+2
| | | | | | | | | | | | underscores. Remove emphasis from system notes to avoid Markdown conflicts in names.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-191-2/+2
|\ \
| * | Changed tis to thisPhil Hughes2015-03-191-2/+2
| |/
* | Fix link to URL auto-linking section in markdown helpPiotr Sampławski2015-03-191-1/+1
|/
* Merge branch 'replace-linux-with-gnu-linux' into 'master'Dmitriy Zaporozhets2015-03-182-2/+2
|\ | | | | | | | | | | | | | | Replace linux with gnu linux To recognize the work of Dr. Stallman. See merge request !391
| * Replace linux with GNU/Linux to recognize the work of Dr. Stallman.replace-linux-with-gnu-linuxSytse Sijbrandij2015-03-152-2/+2
| |
* | Update upgrade and installation docs for 7.9.Marin Jankovski2015-03-172-15/+18
| |
* | Merge branch 'unicorn-workers' into 'master'Dmitriy Zaporozhets2015-03-171-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | Documentation about unicorn settings. Helps with https://news.ycombinator.com/item?id=9213180 See merge request !1704
| * | Documentation about unicorn settings.Sytse Sijbrandij2015-03-161-1/+4
| | |
* | | Add nodejs dependency to upgrader and upgrade from 7.7 docsMarin Jankovski2015-03-162-1/+121
| | |
* | | Add nodejs to installation doc.Marin Jankovski2015-03-161-1/+1
|/ /
* | Merge branch 'montly_doc_with_next_release_blog_article' into 'master'Dmitriy Zaporozhets2015-03-161-4/+8
|\ \ | | | | | | | | | | | | | | | Update monthly doc to mention wip blogpost for next release. See merge request !1697
| * | Update monthly doc to mention wip blogpost for next release.Marin Jankovski2015-03-131-4/+8
| |/
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-1411-17/+50
| |\ \ | | |/ | | | | | | | | | Conflicts: db/schema.rb
| * | Allow admins to override restricted visibilityVinnie Okada2015-03-081-1/+1
| | | | | | | | | | | | | | | Allow admins to use restricted visibility levels when creating or updating projects.
* | | Fix typo for HipChat doc: messaging, not messageStan Hu2015-03-161-1/+1
| | |
* | | Add HipChat integration documentation as this was a source of confusionStan Hu2015-03-162-1/+55
| |/ |/|
* | Change default number of unicorn workers to three.Marin Jankovski2015-03-131-1/+1
| |
* | Update documentation for object_kind field in Webhook push and tag push WebhooksStan Hu2015-03-131-0/+2
| |
* | Merge branch 'enhance_markdown_linebreak_docs' into 'master'Hannes Rosenögger2015-03-131-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Add an example of creating a line break by adding two spaces atEwan Edwards2015-02-111-0/+8
| | | | | | | | | | | | the end of a line.
* | | Merge branch 'emoji_cheatsheet_fix' into 'master'Marin Jankovski2015-03-121-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Updated help documentation to properly reference EmojiOne. [ci skip]Cameron Banga2015-03-121-10/+10
| | | |
* | | | Add deploy to ci.gitlab.com to release documents.Marin Jankovski2015-03-113-0/+4
|/ / /
* | | Add a note about building AMI to security docMarin Jankovski2015-03-111-0/+1
| | |
* | | add AMI update stepJob van der Voort2015-03-112-0/+5
| | |
* | | Add criteria for requesting CVEDmitriy Zaporozhets2015-03-091-1/+1
| | |
* | | remove duplicate right braces ('}') in configuration examples of GitHub,Kuo-Cheng Yeu2015-03-093-5/+5
| | | | | | | | | | | | GitLab, and Google.
* | | Add UI guide to GitLab development helpDmitriy Zaporozhets2015-03-082-0/+13
| |/ |/|
* | Merge branch 'web_hook_extend' into 'master'Dmitriy Zaporozhets2015-03-041-0/+1
|\ \ | | | | | | | | | | | | | | | Web Hook sends email of pusher See merge request !1630
| * | Web Hook sends email of pusherValery Sizov2015-03-041-0/+1
| | |
* | | Moved the Gmail integration line into the list of available integrations.Ewan Edwards2015-03-041-2/+2
| | |
* | | The "GitLab buttons in Gmail" document was not linked from anywhereEwan Edwards2015-03-041-0/+2
|/ / | | | | | | else. It is now linked.
* | Merge branch 'installtion-from-source' into 'master'Dmitriy Zaporozhets2015-03-031-1/+1
|\ \ | | | | | | | | | | | | | | | Clearly mark it as installation from source. See merge request !1622
| * | Clearly mark it as installation from source.Sytse Sijbrandij2015-03-031-1/+1
| | |
* | | Update ci setup documenationDmitriy Zaporozhets2015-03-021-1/+4
| | |
* | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into ↵Dmitriy Zaporozhets2015-03-022-0/+47
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Aorimn-add-irker-service Conflicts: app/controllers/projects/services_controller.rb
| * | Add Irker serviceAorimn2015-03-012-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Irker is a gateway which sends IRC messages on git updates. This new service provides an interface to this gateway, integrated in Gitlab, for each updates. As per the guidelines, this commit adds the new feature in the CHANGELOG, tests and documentation. See http://www.catb.org/esr/irker/
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-024-40/+40
|\ \ \ | |/ /
| * | Merge branch 'master' into 'master'Robert Schilling2015-03-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error in docs for closing an issue API docs for issues says you set parameter 'closed' to '1'. I was not able to do that but I could set 'state_event' to 'close' which closed the issue. Does not work "https://gitlab.com/api/v3/projects/:id/issues/:issue_id?closed=1" Does work "https://gitlab.com/api/v3/projects/:id/issues/:issue_id?state_event=close" See merge request !342
| | * | To close an issue you must set 'state_event' to 'close'. I cannot set ↵Derek Campbell2015-02-201-1/+1
| | | | | | | | | | | | | | | | 'closed' to '1'.
| * | | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-011-3/+6
| |\ \ \ | | | | | | | | | | Expose avatar_url in projects API
| | * | | Expose avatar_url in projects APIsue4452015-03-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog
| * | | | Merge pull request #8757 from bbodenmiller/patch-1Robert Schilling2015-02-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | formatting cleanup on mysql_to_postgresql.md
| | * | | | formatting cleanup on mysql_to_postgresql.mdBen Bodenmiller2015-02-081-1/+1
| | | | | |