Commit Graph
2164 Commits
Author SHA1 Message Date
Jacob Vosmaer eac762c89b Merge branch 'ldap_doc_fix' into 'master'
Corrected LDAP documentation to include `admin_group` in the new syntax.

Fixes #255

/cc @job

See merge request !338
2015-03-26 10:55:21 +00:00
Marin Jankovski 47a3d6d664 Packages for 7.9.1. 2015-03-25 16:55:54 -07:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
2015-03-25 09:16:09 -07: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
Dmitriy Zaporozhets 1dafe0c6c3 Remove unnecessary newline on Help page 2015-03-24 16:21:39 -07:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +00:00
Dmitriy Zaporozhets fbaf39caa2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-03-21 20:41:39 -07:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
2015-03-21 20:41:10 -07:00
Vinnie Okada 5f86c08b2a Fix link in patch update guide 2015-03-21 11:29:24 -06:00
Marin Jankovski 14947985d3 Add packages for 7.9.0 2015-03-20 21:36:30 -07:00
Marin Jankovski b7229356d5 Change the name of the key used for bitbucket importer. 2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets 489da67c9c Merge branch 'update_screenshot_githooks' into 'master'
[Documentation] Update screenshots of git hooks page

See merge request !358
2015-03-20 16:34:26 +00:00
Valery Sizov 41edbae0d1 Update screenshots of git hook page 2015-03-20 16:26:27 +02:00
Valery Sizov 6aa07e855a Mention group level web hooks in documentation 2015-03-20 16:12:02 +02:00
Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	spec/models/note_spec.rb
2015-03-19 23:21:50 -07: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
Marin Jankovski 2bf3d9f495 Packages for 7.8.4 with openssl 1.0.1m. 2015-03-19 10:51:40 -07: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
Dmitriy Zaporozhets aec8c717a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	Gemfile
	VERSION
	app/models/service.rb
2015-03-18 10:33:31 -07: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 3945ed65cf Merge remote-tracking branch 'ce/master' into ce_into_ee
Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.9.md
2015-03-17 15:00:13 -07:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
2015-03-16 21:25:00 -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
Marc Radulescu c30629e15f add documentation file 2015-03-12 16:58:11 -07:00
Marc Radulescu d3b4f65da9 separate documentation for rebase before merge 2015-03-12 16:32:26 -07:00
Valery Sizov e3df22f224 Merge remote-tracking branch 'dev/master' into ce_upstream1 2015-03-12 18:39:24 +02: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
Dmitriy Zaporozhets c216a30519 Merge branch 'ce-to-ee' into 'master'
CE to EE

cc @marin

See merge request !347
2015-03-12 15:59:58 +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
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
2015-03-11 18:41:41 -07:00
Marin Jankovski 2074bafd07 Add packages for 7.8.3 and 7.8.4. 2015-03-11 18:28:31 -07:00
Marin Jankovski 66384d7d44 Add a note about building AMI to security doc 2015-03-11 17:50:02 -07:00