summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup bootstrap variable example filerefactor-cssDmitriy Zaporozhets2015-03-171-741/+4
|
* More use of sass variables. Reject flatly gray colorsDmitriy Zaporozhets2015-03-175-24/+17
|
* Merge branch 'css-vars' into 'master'Dmitriy Zaporozhets2015-03-189-29/+29
|\ | | | | | | | | | | More actively use css variabled to prevent colors duplication See merge request !1715
| * More actively use css variabled to prevent colors duplicationDmitriy Zaporozhets2015-03-179-29/+29
| |
* | Fix scroll for last push widgetDmitriy Zaporozhets2015-03-171-1/+3
|/
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-171-0/+17
|\ | | | | | | | | | | | | | | | | | | | | | | 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-171-8/+8
| |
| * testsValery Sizov2015-03-161-2/+1
| |
| * SubscriptionValery Sizov2015-03-151-0/+18
| |
* | Fix button color inside alertDmitriy Zaporozhets2015-03-161-1/+1
| |
* | Fix editor UI bugDmitriy Zaporozhets2015-03-161-2/+0
| |
* | Remove ugly highlight stylesDmitriy Zaporozhets2015-03-161-5/+0
| |
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1473-519/+1229
| |\ \ | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | Move restricted visibility settings to the UIVinnie Okada2015-03-071-0/+5
| | | | | | | | | | | | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* | | | Use same layout and interactivity for project members as group members.Douwe Maan2015-03-152-1/+7
| | | |
* | | | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-151-1/+1
| | | |
* | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-153-3/+3
| | | |
* | | | Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-141-0/+5
| |/ / |/| |
* | | Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-142-8/+8
|\ \ \
| * | | Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-142-8/+8
| | | |
* | | | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-141-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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-141-0/+5
| | | |
* | | | Improve compare switch buttonDmitriy Zaporozhets2015-03-141-7/+1
| | | |
* | | | Refactor buttonsDmitriy Zaporozhets2015-03-142-16/+2
|/ / /
* | | Use sass variabled for backgroung and border colorsDmitriy Zaporozhets2015-03-139-25/+33
| | |
* | | Improve css for file actionsDmitriy Zaporozhets2015-03-132-19/+10
| |/ |/|
* | Implement merge requests searchDmitriy Zaporozhets2015-03-123-6/+34
| | | | | | | | | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-122-5/+52
|\ \ | | | | | | | | | | | | | | | Style improvements to import page See merge request !1685
| * | Style improvements to import pageDmitriy Zaporozhets2015-03-122-5/+52
| | |
* | | Merge branch 'blue-theme' into 'master'Dmitriy Zaporozhets2015-03-122-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add blue theme to GitLab See merge request !1682
| * | | Add blue theme to GitLabDmitriy Zaporozhets2015-03-112-0/+10
| |/ /
* | | Merge branch 'hover_toggle_sidebar'Marin Jankovski2015-03-121-3/+10
|\ \ \ | |/ / |/| | | | | | | | Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
| * | Reverting pixel changeSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | Breaks navbar
| * | Fixed up app_logoSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | Pixel perfection.
| * | Added hover stateSabba Petri2015-02-251-4/+11
| | | | | | | | | | | | And also fixed it being one pixel off.
* | | Merge branch 'fix-code-preview' into 'master'Marin Jankovski2015-03-115-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code preview theme setting for comments, issues, merge requests, and snippets User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme. Closes #1139 See merge request !357
| * | | Fix code preview theme setting for comments, issues, merge requests, and ↵Stan Hu2015-03-105-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
* | | | Cleanup after removing group tab from dashboard asideDmitriy Zaporozhets2015-03-102-40/+0
| | | |
* | | | Fix line highlight being hidden by headerDmitriy Zaporozhets2015-03-101-1/+1
| | | |
* | | | Fix highlight of selected linesDmitriy Zaporozhets2015-03-105-8/+8
|/ / /
* | | Improve tree view UIDmitriy Zaporozhets2015-03-101-3/+8
| | |
* | | Fix font size for collapse buttonDmitriy Zaporozhets2015-03-091-0/+1
| | |
* | | Merge branch 'font-size-14' into 'master'Dmitriy Zaporozhets2015-03-1013-29/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Font size 14px Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable See merge request !1663
| * | | Reduce base vertical paddingDmitriy Zaporozhets2015-03-092-4/+2
| | | |
| * | | Increate default font-size from 13 to 14pxDmitriy Zaporozhets2015-03-0911-25/+12
| | | |
* | | | Fix heading small color to darker oneDmitriy Zaporozhets2015-03-091-1/+1
|/ / /
* | | Make broadcast message look like a warning by defaultDmitriy Zaporozhets2015-03-092-12/+11
| | |
* | | Fix wrong body padding and pre colorDmitriy Zaporozhets2015-03-092-2/+2
| | |
* | | Merge branch 'more-flat-ui' into 'master'Dmitriy Zaporozhets2015-03-105-22/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply more styles from Flatly theme Also add bottom margin for footer links on login page See merge request !1661