Commit Graph
14901 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 5bbc70da9c Merge branch 'update-grack' into 'master'
Update Grack.

See merge request !1712
2015-03-18 00:15:04 +00:00
Dmitriy Zaporozhets d2979c778f Merge branch 'update-omniauth-ldap' into 'master'
Update omniauth-ldap.

See merge request !1713
2015-03-18 00:14:04 +00:00
Dmitriy Zaporozhets cb3b671839 Its time for 7.10.0.pre 2015-03-17 17:06:40 -07:00
Marin Jankovski c6f57d73e0 Merge branch 'update_install_documentation' into 'master'
Update installation and upgrade documentation

See merge request !1714
2015-03-17 21:53:25 +00:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Douwe Maan 745aad4196 Merge branch 'fix_service_trigger_ui' into 'master'
Fix service UI

There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported.

Before:
![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png)

I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time.

See merge request !395
2015-03-17 17:32:57 +00:00
Drew Blessing 6a269450e6 Fix UI bug regarding services 2015-03-17 12:09:26 -05:00
Dmitriy Zaporozhets 94238a9a7d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-17 09:49:55 -07:00
Dmitriy Zaporozhets bfc8ded120 Merge branch 'last-deploy-key' into 'master'
Delete deploy key when last connection to a project is destroyed.

Addresses #1959.

See merge request !1710
2015-03-17 16:49:38 +00:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
2015-03-17 16:45:04 +00:00
Douwe Maan 16b7317669 Update omniauth-ldap. 2015-03-17 17:15:39 +01:00
Douwe Maan b27622a16f Update Grack. 2015-03-17 16:34:17 +01:00
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Douwe Maan 7d2b34bd61 Satisfy Rubocop. 2015-03-17 16:00:32 +01:00
Douwe Maan 9c7fffb655 Delete deploy key when last connection to a project is destroyed. 2015-03-17 14:55:43 +01:00
Douwe Maan df91781a34 Fix changelog. 2015-03-17 10:09:49 +01:00
Douwe Maan e4ac6bbf82 Merge branch 'atom-xhtml-squashed' into 'master'
Fix invalid Atom feeds when using emoji, horizontal rules, or images

This is a fix for issues #880, #723, #1113.

Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.

To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.

I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.

Thorough review appreciated since this is the first time I have used Ruby.

See merge request !344
2015-03-17 08:38:38 +00:00
Dmitriy Zaporozhets 409097bd7e Properly align save user profile button 2015-03-17 00:06:25 -07:00
Dmitriy Zaporozhets 3a324d9c6d Revert "Merge branch 'backup-permissions' into 'master'"
This reverts commit c42262b43b, reversing
changes made to c6586b1283.
2015-03-16 23:51:46 -07:00
Dmitriy Zaporozhets 84edc020b2 Fix button color inside alert 2015-03-16 23:44:30 -07:00
Dmitriy Zaporozhets 89ef79f8b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-16 19:14:21 -07:00
Dmitriy Zaporozhets c42262b43b Merge branch 'backup-permissions' into 'master'
Change permissions on backup files

Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.  See #1894.  Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600.

cc @sytse

See merge request !1703
2015-03-17 02:13:44 +00: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
Dmitriy Zaporozhets 3869bdf718 Merge branch 'relative-sematic-versioning' into 'master'
Relative sematic versioning

Note to indicate that semantic versioning is not absolute or allows you to fly blind.

See merge request !286
2015-03-17 00:47:18 +00:00
Dmitriy Zaporozhets 39772a0164 Merge branch 'fix-null-visibility' into 'master'
Handle null restricted_visibility_levels setting

Fix a 500 error when the `restricted_visibility_levels` setting is null in the database - see #2134.

See merge request !1705
2015-03-17 00:03:55 +00:00
Christian Walther 90aa870c36 Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-03-16 22:05:52 +01:00
Marin Jankovski ba0d2a461b Merge branch 'dependency_to_documentation' into 'master'
Dependency to documentation

See merge request !1707
2015-03-16 20:56:47 +00:00
Marin Jankovski 5c88c8eea6 Merge branch 'remove_rubyracer' into 'master'
Remove rubyracer gem

See merge request !1706
2015-03-16 20:55:06 +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
Dmitriy Zaporozhets 8eebb6e566 Fix editor UI bug 2015-03-16 13:13:02 -07:00
Vinnie Okada 2e672c39a0 Fix restricted visibility bugs
Check for nil values in the restricted_visibility_level validation
method, and set the restricted visibility request parameter to `[]` when
it's missing from the request.
2015-03-16 13:59:50 -06:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Vinnie Okada 7c3c836d3b Handle null restricted_visibility_levels setting
Fix a 500 error when the `restricted_visibility_levels` setting is null
in the database.
2015-03-16 13:29:27 -06:00
Sytse Sijbrandij 9269606c94 Documentation about unicorn settings. 2015-03-16 12:09:53 -07:00
Dmitriy Zaporozhets cba6d797d7 Remove ugly highlight styles 2015-03-16 11:12:44 -07:00
Dmitriy Zaporozhets 7dedbfb097 Bump gitlab-shell version 2015-03-16 10:56:54 -07:00
Dmitriy Zaporozhets 998f990714 Merge branch 'post-receive-base64' into 'master'
Prevent gitlab-shell character encoding issues by receiving its changes as raw data.

Depends on gitlab/gitlab-shell!65.

Fixes:

- https://github.com/gitlabhq/gitlabhq/issues/7486
- https://gitlab.com/gitlab-org/gitlab-ce/issues/858
- https://gitlab.com/gitlab-org/gitlab-ce/issues/877
- https://gitlab.com/gitlab-org/gitlab-ce/issues/965

See merge request !1701
2015-03-16 17:53:26 +00: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
Hannes Rosenögger 7b178bc7eb Merge branch 'fix-typos' into 'master'
Fix typos

Fix minor typo in docs and CHANGELOG.

See merge request !394
2015-03-16 17:21:58 +00:00
Stan Hu 93e321e7c8 Fix typo in CHANGELOG and add credit 2015-03-16 09:46:23 -07:00
Stan Hu 37973ef61b Fix typo for HipChat doc: messaging, not message 2015-03-16 09:39:43 -07:00
Hannes Rosenögger b3c226765e Merge branch 'add-hipchat-doc' into 'master'
Add documentation for HipChat integration

This was a source of confusion here:

https://github.com/gitlabhq/gitlabhq/issues/7373

See merge request !393
2015-03-16 16:35:36 +00:00
Stan Hu 055457360c Add HipChat integration documentation as this was a source of confusion 2015-03-16 09:33:18 -07:00
Hannes Rosenögger d500a79d63 Merge branch 'auto-config-git' into 'master'
Auto config git if user forgot

If git is not configured properly, let gitlab:check try to fix it by executing the commands itself instead of outputing how the user could fix it.

If this fails the error is still displayed.

Edit;
Not yet added to the CHANGELOG as;
* Im not really sure this fits in the scope of a test
* No clue how to test this properly

See merge request !383
2015-03-16 16:09:37 +00:00
Zeger-Jan van de Weg 67f55d9b25 Let the server fix unconfigured git 2015-03-16 16:28:20 +01:00
Valery Sizov f53683e67f fix specs 2015-03-16 16:51:49 +02:00
Valery Sizov 410d25c8ca rename table subscribe; make it polymorfic 2015-03-16 15:22:50 +02:00
Valery Sizov 0e20dc910f update changelog 2015-03-16 13:58:34 +02:00