summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Make sure issue assignee is properly reset.Douwe Maan2015-03-241-5/+2
|
* Merge branch 'userpage-activity-scroll'Dmitriy Zaporozhets2015-03-231-0/+1
|\ | | | | | | | | Conflicts: app/controllers/users_controller.rb
| * Add inifinite scroll to user activity on user pageDmitriy Zaporozhets2015-03-221-0/+1
| |
* | Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-232-25/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
| * | Improve contribution calendar per day infoDmitriy Zaporozhets2015-03-222-24/+0
| | |
| * | Replace commits calendar with contributions calendarDmitriy Zaporozhets2015-03-211-1/+1
| |/ | | | | | | | | | | * count opening of issues and merge requests * dont trigger git repository - use events from database * much-much faster since does not affected by repository size
* | Make panel heading font boldDmitriy Zaporozhets2015-03-221-0/+2
| |
* | Remove old GitLab auth imageRobert Schilling2015-03-221-0/+0
|/
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-213-28/+25
|
* Remove 32px oauth imagesDmitriy Zaporozhets2015-03-217-0/+0
|
* Hide UI elements when print md files or wiki pagesfix-print-cssDmitriy Zaporozhets2015-03-211-0/+4
|
* Merge branch 'improve-avatar-header' into 'master'Dmitriy Zaporozhets2015-03-212-5/+19
|\ | | | | | | | | | | | | | | Improve header with avatar for group and user pages Nice looking and aligned headers for user and group pages See merge request !412
| * Improve header with avatar for group and user pagesDmitriy Zaporozhets2015-03-202-5/+19
| |
* | Prevent diff header overflowDmitriy Zaporozhets2015-03-201-1/+3
|/
* Improve issue sidebar positionDmitriy Zaporozhets2015-03-202-2/+2
|
* Make issue and merge request sidebar more compactupvotes-refactoringDmitriy Zaporozhets2015-03-202-36/+7
| | | | | * move votes block to participants * make smaller font in sidebar
* Remove upvotes js logic since it does not work as expected anywayDmitriy Zaporozhets2015-03-202-21/+1
|
* Improve project name truncation on dashboard to work well with sm screenDmitriy Zaporozhets2015-03-201-1/+1
|
* Merge branch 'add_canceled_ci_status' into 'master'Dmitriy Zaporozhets2015-03-192-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | Add canceled CI status Fixes https://github.com/gitlabhq/gitlab-ci/issues/564 https://dev.gitlab.org/gitlab/gitlab-ci/issues/169 ![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png) See merge request !1729
| * add canceled CI statusValery Sizov2015-03-192-1/+7
| |
* | Use same font for project description and star linksDmitriy Zaporozhets2015-03-191-2/+6
| |
* | fix(style): align navbar-togglekingcody2015-03-191-1/+1
|/ | | | | Changes: - change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-186-67/+27
|\
| * Merge branch 'improve-ui' into 'master'Dmitriy Zaporozhets2015-03-195-64/+26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Improve UI * Improve group rename warning * Refactor select css. Make selects same width See merge request !400
| | * Refactor select css. Make selects same widthDmitriy Zaporozhets2015-03-185-64/+26
| | |
| * | Improve comment toggle button in diffDmitriy Zaporozhets2015-03-181-3/+1
| |/
* | Fix project name overflow on dashboardDmitriy Zaporozhets2015-03-181-13/+4
|/
* Merge branch 'commit_calendar_activity' into 'master'Douwe Maan2015-03-182-26/+53
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend commit calendar to actually show what commits were made on a date ## What does this MR do? This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project. It is based on the optimizations @dzaporozhets made for the calendar. ## Are there points in the code the reviewer needs to double check? The UI and how the links are generated i guess. That feels hacky at the moment :/ ## Screenshot: ![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png) I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :) See merge request !326
| * Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-182-26/+53
| |
* | enable line wrapping by default and remove the checkbox to change itHannes Rosenögger2015-03-181-14/+0
|/
* Remove to old GitLab colors for succes and primaryDmitriy Zaporozhets2015-03-173-10/+5
|
* 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
| |/ / |/| |