summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix UI bug regarding servicesDrew Blessing2015-03-172-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-178-19/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix changelog.Douwe Maan2015-03-171-3/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'atom-xhtml-squashed' into 'master'Douwe Maan2015-03-178-19/+55
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | Fix invalid Atom feeds when using emoji, horizontal rules, or images.Christian Walther2015-03-168-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'last-deploy-key' into 'master'Dmitriy Zaporozhets2015-03-174-2/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete deploy key when last connection to a project is destroyed. Addresses #1959. See merge request !1710
| * | | | | | | | | Satisfy Rubocop.Douwe Maan2015-03-171-2/+1
| | | | | | | | | |
| * | | | | | | | | Delete deploy key when last connection to a project is destroyed.Douwe Maan2015-03-174-2/+45
| |/ / / / / / / /
* | | | | | | | | Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-1717-4/+245
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | improve UIValery Sizov2015-03-175-22/+30
| | | | | | | | |
| * | | | | | | | testsValery Sizov2015-03-1615-25/+115
| | | | | | | | |
| * | | | | | | | fix specsValery Sizov2015-03-163-12/+22
| | | | | | | | |
| * | | | | | | | rename table subscribe; make it polymorficValery Sizov2015-03-1611-44/+41
| | | | | | | | |
| * | | | | | | | update changelogValery Sizov2015-03-161-0/+1
| | | | | | | | |
| * | | | | | | | code folding fixValery Sizov2015-03-165-8/+19
| | | | | | | | |
| * | | | | | | | SubscriptionValery Sizov2015-03-1511-3/+127
| | | | | | | | |
* | | | | | | | | Properly align save user profile buttonDmitriy Zaporozhets2015-03-171-2/+4
| | | | | | | | |
* | | | | | | | | Revert "Merge branch 'backup-permissions' into 'master'"Dmitriy Zaporozhets2015-03-163-48/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c42262b43b009af990e5769840391862d64a1c2d, reversing changes made to c6586b1283a94c8f08bc669f4d8a9384b263073e.
* | | | | | | | | Fix button color inside alertDmitriy Zaporozhets2015-03-161-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-161-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'relative-sematic-versioning' into 'master'Dmitriy Zaporozhets2015-03-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relative sematic versioning Note to indicate that semantic versioning is not absolute or allows you to fly blind. See merge request !286
| | * | | | | | | | | Add note about semantic versioning not being absolute.relative-sematic-versioningSytse Sijbrandij2015-01-101-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'backup-permissions' into 'master'Dmitriy Zaporozhets2015-03-173-7/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Change permissions on backup filesVinnie Okada2015-03-153-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.
* | | | | | | | | | | | 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
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-null-visibility' into 'master'Dmitriy Zaporozhets2015-03-173-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Fix restricted visibility bugsVinnie Okada2015-03-162-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | Handle null restricted_visibility_levels settingVinnie Okada2015-03-161-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a 500 error when the `restricted_visibility_levels` setting is null in the database.
* | | | | | | | | | | | Merge branch 'dependency_to_documentation' into 'master'Marin Jankovski2015-03-163-2/+122
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependency to documentation See merge request !1707
| * | | | | | | | | | | | 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 'remove_rubyracer' into 'master'Marin Jankovski2015-03-162-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove rubyracer gem See merge request !1706
| * | | | | | | | | | | | Remove rubyracer gem.remove_rubyracerMarin Jankovski2015-03-132-7/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix editor UI bugDmitriy Zaporozhets2015-03-161-2/+0
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Remove ugly highlight stylesDmitriy Zaporozhets2015-03-161-5/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Bump gitlab-shell versionDmitriy Zaporozhets2015-03-161-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'post-receive-base64' into 'master'Dmitriy Zaporozhets2015-03-165-10/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Prevent gitlab-shell character encoding issues by receiving its changes as ↵Douwe Maan2015-03-155-10/+30
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raw data.
* | | | | | | | | | | | 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-1633-104/+370
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14321-1661/+3476
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | | | | | | | Add tests for snippet servicesVinnie Okada2015-03-142-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rspec tests for the new UpdateSnippetService and CreateSnippetService classes.
| * | | | | | | | | | | | | Update snippet authorizationVinnie Okada2015-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow authors and admins to update the visibility level of personal and project snippets.
| * | | | | | | | | | | | | More restricted visibility changesVinnie Okada2015-03-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixes and new tests for the restricted visibility changes.
| * | | | | | | | | | | | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-0812-63/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new service classes to create and update project and personal snippets. These classes are responsible for enforcing restricted visibility settings for non-admin users.
| * | | | | | | | | | | | | Allow admins to override restricted visibilityVinnie Okada2015-03-0811-20/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admins to use restricted visibility levels when creating or updating projects.
| * | | | | | | | | | | | | Move restricted visibility settings to the UIVinnie Okada2015-03-0716-49/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* | | | | | | | | | | | | | Merge branch 'fix-typos' into 'master'Hannes Rosenögger2015-03-162-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos Fix minor typo in docs and CHANGELOG. See merge request !394