summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-081-0/+2
| | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.
* Merge branch 'upgrade-guide-gitlab-shell' into 'master'Dmitriy Zaporozhets2015-04-211-1/+1
| | | | | | | | 7.10 requires gitlab-shell 2.6.2. Fixes #1467. See merge request !552
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-163-6/+6
|\
| * Merge pull request #9131 from chulkilee/ruby-2.1.6Dmitriy Zaporozhets2015-04-162-5/+5
| |\ | | | | | | ruby 2.1.6
| | * ruby 2.1.6Chulki Lee2015-04-132-5/+5
| | | | | | | | | | | | https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
| * | Merge pull request #9094 from bbodenmiller/patch-1Jeroen van Baarsen2015-04-161-1/+1
| |\ \ | | | | | | | | update text to reference new location of setting
| | * | update text to reference new location of settingBen Bodenmiller2015-04-051-1/+1
| | | |
* | | | update guides for 7.10Job van der Voort2015-04-162-13/+13
|/ / /
* | | Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-141-0/+5
| |/ |/|
* | document support for inline HTMLBen Bodenmiller2015-04-111-3/+1
| |
* | Merge pull request #9114 from dreis2211/dreis2211-patch-1Dmitriy Zaporozhets2015-04-101-0/+3
|\ \ | | | | | | Include creator_id in project info of API
| * | Update API documentation of projects with creator_idChristoph Dreis2015-04-101-0/+3
| | |
* | | Corrected title of forking workflow on the README link.Patricio Cano2015-04-081-1/+1
|/ /
* | Merge branch 'bump_all_versions' into 'master'Dmitriy Zaporozhets2015-04-081-7/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Added step to bump all versions (CE, EE, CI) every time there is a patch ↵Patricio Cano2015-04-071-7/+4
| |/ | | | | | | release and the reasoning behind it
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-081-0/+3
|\ \
| * \ Merge pull request #8546 from h0ru5/patch-1Jeroen van Baarsen2015-04-081-0/+3
| |\ \ | | |/ | |/| add necessary dir for uploads in update to 6.7
| | * add necessary dir for uploads in update to 6.7 Johannes Hund2015-01-071-0/+3
| | | | | | | | | rake task gitlab:backup:create crashes otherwise
* | | Corrected title of forking workflowPatricio Cano2015-04-071-1/+1
| | |
* | | Merge branch 'forking-doc' into 'master'Sytse Sijbrandij2015-04-086-0/+37
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Documentation on how to fork a project Added documentation on how to fork a project. /cc @sabba See merge request !1623
| * | Implemented changes suggested by Job.Patricio Cano2015-04-071-7/+8
| | |
| * | Corrected sentence about GitLab FlowPatricio Cano2015-03-031-1/+3
| | |
| * | Corrected images pathsPatricio Cano2015-03-031-4/+4
| | |
| * | Created documentation on how to fork a project.Patricio Cano2015-03-036-0/+34
| | |
* | | Modified lib/api/entities.rb to expose Project class tag_list property to ↵Cristian Medina2015-04-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-021-0/+7
| | |
* | | Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-301-2/+33
| | |
* | | Fix typo 'projecti' to 'project' in ssh doc [ci skip]Bart Deslagmulder2015-03-261-1/+1
| | |
* | | Merge branch 'doc_group_permissions' into 'master'Dmitriy Zaporozhets2015-03-261-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | [doc] Groups can be browsable if they contain at least one public project. See merge request !451
| * | | [doc] Groups can be browsable if they contain at least one public project.Achilleas Pipinellis2015-03-251-2/+5
| | | |
* | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-251-0/+2
|\ \ \ \ | | | | | | | | | | Allow HTML tags in user Markdown input
| * \ \ \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-222-2/+2
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-217-15/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge updated CHANGELOG entries
| * | | | | Change HTML sanitizationVinnie Okada2015-03-191-58/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `SanitizationFilter` class from the html-pipeline gem for inline HTML instead of calling the Rails `sanitize` method.
| * | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-17138-772/+3829
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use the latest HTML pipeline gem
| * | | | | | Document whitelisted HTML tags and attributesVinnie Okada2014-10-101-0/+59
| | | | | | |
* | | | | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-03-251-3/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation - Markdown - added missing line-break info as promised, I updated the Markdown documentation with the line-breaks info See merge request !186
| * | | | | | how to render line-breaksDmitri Goosens2014-09-171-3/+4
| | | | | | |
* | | | | | | 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