Commit Graph
2231 Commits
Author SHA1 Message Date
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
Patricio Cano 09dbe452e3 Corrected sentence about GitLab Flow 2015-03-03 21:44:53 -08:00
Patricio Cano 92b1b15f6f Corrected images paths 2015-03-03 12:38:45 -08:00
Patricio Cano 01bd632c66 Created documentation on how to fork a project. 2015-03-03 12:31:54 -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
Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service
Conflicts:
	app/controllers/projects/services_controller.rb
2015-03-02 15:22:31 -08:00
Dmitriy Zaporozhets ed3bd155fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 13:45:46 -08:00
Dmitriy Zaporozhets 70e3409a50 Merge branch 'shell-paths' into 'master'
More reasons why prefixing is good

Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html

See merge request !1604
2015-03-02 21:37:10 +00:00
Aorimn f84b7eef3f Add Irker service
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/
2015-03-01 20:51:03 +01:00
Robert Schilling 4e5bc1d535 Merge branch 'master' into 'master'
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
2015-03-01 12:02:12 +00:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url
Expose avatar_url in projects API
2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
2015-03-01 10:13:01 +09:00
Robert Schilling 8aabb58d5b Merge pull request #8757 from bbodenmiller/patch-1
formatting cleanup on mysql_to_postgresql.md
2015-02-28 23:14:08 +01:00
Robert Schilling 3678b64b4a Merge pull request #8758 from bbodenmiller/patch-3
use gitlab branch of mysql-postgresql-converter
2015-02-28 23:13:08 +01:00
Robert Schilling e45811c12e Merge pull request #8803 from Bugagazavr/patch-2
Correct json payload [ci skip]
2015-02-28 23:05:27 +01:00
Sytse Sijbrandij 039fd3c562 Merge branch 'update_logs_document' into 'master'
Mention audit events ee feature in logs documentation.

Related to gitlab/gitlabhq#1979

See merge request !1609
2015-02-28 01:15:36 +00:00
Dmitriy Zaporozhets c85935c42a Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master'
Add 'confirm' option to users api

For #1990

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129

See merge request !1610
2015-02-27 22:59:44 +00:00
Dmitriy Zaporozhets 0d22b75b03 Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm
Conflicts:
	lib/api/users.rb
2015-02-27 13:01:57 -08:00
Marin Jankovski 238455aa97 Mention audit events ee feature in logs documentation. 2015-02-27 12:32:05 -08:00