summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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
| * | | | | | | | | | | Fix typo in CHANGELOG and add creditStan Hu2015-03-161-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix typo for HipChat doc: messaging, not messageStan Hu2015-03-161-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-hipchat-doc' into 'master'Hannes Rosenögger2015-03-163-1/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for HipChat integration This was a source of confusion here: https://github.com/gitlabhq/gitlabhq/issues/7373 See merge request !393
| * | | | | | | | | | | Add HipChat integration documentation as this was a source of confusionStan Hu2015-03-163-1/+56
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'auto-config-git' into 'master'Hannes Rosenögger2015-03-163-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Let the server fix unconfigured gitZeger-Jan van de Weg2015-03-163-10/+32
|/ / / / / / / / / / /
* | | | | | | | | | | Small improvements to group/project member rowsDmitriy Zaporozhets2015-03-153-2/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'team-members' into 'master'Dmitriy Zaporozhets2015-03-1673-407/+462
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same layout and interactivity for project members as group members and make code more consistent. It's probably easiest to review the commits one by one, but keep in mind that later commits sometimes touch the same place as earlier ones, so look at the complete diff to add comments. The project members page and group members page now look and work the same, with an inline "Add members" form, member search and editing of access levels and deleting without page refresh. Before: ![Screen_Shot_2015-03-13_at_16.50.39](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2cd023c48de0a643ce04df965f39e1f5/Screen_Shot_2015-03-13_at_16.50.39.png) After: ![Screen_Shot_2015-03-13_at_16.50.02](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fdef480daf2859ed74f5641af1f337b3/Screen_Shot_2015-03-13_at_16.50.02.png) See merge request !1695
| * | | | | | | | | | Add changelog item.Douwe Maan2015-03-151-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Update button class.Douwe Maan2015-03-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix failing specs.Douwe Maan2015-03-151-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Use same layout and interactivity for project members as group members.Douwe Maan2015-03-1519-106/+137
| | | | | | | | | | |
| * | | | | | | | | | Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-155-25/+18
| | | | | | | | | | |
| * | | | | | | | | | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-1514-37/+60
| | | | | | | | | | |
| * | | | | | | | | | Move project members index from `/team` to `/project_members`Douwe Maan2015-03-157-10/+9
| | | | | | | | | | |
| * | | | | | | | | | Remove old team scopes.Douwe Maan2015-03-153-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Use `member` instead of `tm`.Douwe Maan2015-03-152-33/+33
| | | | | | | | | | |
| * | | | | | | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-1525-134/+143
| | | | | | | | | | |
| * | | | | | | | | | Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-1514-59/+59
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #8955 from wasamasa/fix-deploy.sh-typoRobert Schilling2015-03-141-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Fix typo
| | * | | | | | | | Fix typoVasilij Schneidermann2015-03-141-1/+1
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'fix-mr-notes' into 'master'Dmitriy Zaporozhets2015-03-142-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pre-wrap for diff code in discussion view This prevents merge request comments from being hidden in discussion view. See #2017. ### Before ![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png) ### After ![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png) This change doesn't affect the "Changes" tab: ![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png) cc @sytse See merge request !1700
| * | | | | | | | Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-142-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-143-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-143-9/+9
| | | | | | | | |
* | | | | | | | | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-142-25/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restyle import Render import providers in one line and make it buttons See merge request !1699
| * | | | | | | | | Improve import buttons on new project pageDmitriy Zaporozhets2015-03-142-25/+23
| | | | | | | | | |
* | | | | | | | | | Merge branch 'more-flatly' into 'master'Dmitriy Zaporozhets2015-03-1463-172/+167
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More flatly * use sass variables for repeating colors * use more of Flatly theme variables * refactor buttons See merge request !1698
View Lorry Controller Status