Commit Graph
2198 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 533b5721c6 Merge branch 'unset-assignee' into 'master'
Make sure issue assignee is properly reset.

Previously, when the assignee was reset via the sidebar or bulk edit, `assignee_id` was set to `-1` rather than `null`, which caused the two issues shown below:

![Screen_Shot_2015-03-24_at_16.52.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3c937795c45031c3c72c124ced866598/Screen_Shot_2015-03-24_at_16.52.13.png)

- A "(deleted)" participant
- An empty selectbox in the sidebar, instead of "Select assignee"

See merge request !443
2015-03-24 21:10:18 +00:00
Douwe Maan 515e9d51df Make sure issue assignee is properly reset. 2015-03-24 16:52:02 +01:00
Dmitriy Zaporozhets 27809a8059 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 17:10:56 -07:00
Dmitriy Zaporozhets 2cd6cc7fed Merge branch 'improve-diff-header' into 'master'
Fix file mode going to next line in diff header

See merge request !432
2015-03-24 00:09:40 +00:00
hebbet 97dd1046e7 Change comment in blue ui to match other scss
Change comment in blue ui to match other scss files
2015-03-23 20:07:13 +01:00
Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll'
Conflicts:
	app/controllers/users_controller.rb
2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets e24da35984 Merge branch 'improve-contributions-calendar' into 'master'
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
2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets 61700f619c Fix file mode going to next line in diff header 2015-03-23 09:38:52 -07:00
Dmitriy Zaporozhets bc4e251898 Make panel heading font bold 2015-03-22 20:16:25 -07:00
Dmitriy Zaporozhets 9968250211 Add inifinite scroll to user activity on user page 2015-03-22 15:40:26 -07:00
Dmitriy Zaporozhets 8494170550 Improve contribution calendar per day info 2015-03-22 14:52:44 -07:00
Robert Schilling 38ba8b45ad Remove old GitLab auth image 2015-03-22 09:05:13 +01:00
Dmitriy Zaporozhets 64891c6c40 Replace commits calendar with contributions calendar
* 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
2015-03-21 23:48:08 -07:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets 9f1c284408 Remove 32px oauth images 2015-03-21 17:41:58 -07:00
Dmitriy Zaporozhets b624b775aa Hide UI elements when print md files or wiki pages 2015-03-21 12:13:47 -07:00
Dmitriy Zaporozhets 6cf189f0a9 Merge branch 'improve-avatar-header' into 'master'
Improve header with avatar for group and user pages

Nice looking and aligned headers for user and group pages

See merge request !412
2015-03-21 04:30:57 +00:00
Dmitriy Zaporozhets 222e53a026 Prevent diff header overflow 2015-03-20 20:46:04 -07:00
Dmitriy Zaporozhets beece83af1 Improve header with avatar for group and user pages 2015-03-20 20:15:13 -07:00
Dmitriy Zaporozhets b0e2441330 Improve issue sidebar position 2015-03-20 15:33:13 -07:00
Dmitriy Zaporozhets 085e5084a8 Make issue and merge request sidebar more compact
* move votes block to participants
* make smaller font in sidebar
2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets 1f711fd93d Remove upvotes js logic since it does not work as expected anyway 2015-03-20 12:34:21 -07:00
Dmitriy Zaporozhets d735321ebd Improve project name truncation on dashboard to work well with sm screen 2015-03-20 11:32:44 -07:00
Dmitriy Zaporozhets 476199e069 Merge branch 'add_canceled_ci_status' into 'master'
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
2015-03-19 17:21:20 +00:00
Valery Sizov 19032c0319 add canceled CI status 2015-03-19 18:27:24 +02:00
Dmitriy Zaporozhets 1fdf4508d4 Use same font for project description and star links 2015-03-19 09:12:11 -07:00
kingcody 575ae80647 fix(style): align navbar-toggle
Changes:
- change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`
2015-03-19 05:14:50 -04:00
Dmitriy Zaporozhets fa7ee3ade8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 21:16:43 -07:00
Dmitriy Zaporozhets 3ab7933cc8 Merge branch 'improve-ui' into 'master'
Improve UI

* Improve group rename warning
* Refactor select css. Make selects same width

See merge request !400
2015-03-19 04:16:28 +00:00
Dmitriy Zaporozhets ba39ca9f4a Fix project name overflow on dashboard 2015-03-18 21:05:39 -07:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Douwe Maan 1f21dfaeab Merge branch 'commit_calendar_activity' into 'master'
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
2015-03-18 13:05:07 +00:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Hannes Rosenögger 9e5738b007 Extend the commit calendar to show the actual commits for a date 2015-03-18 08:42:42 +01:00
Dmitriy Zaporozhets 521785157b Remove to old GitLab colors for succes and primary 2015-03-17 22:48:00 -07:00
Dmitriy Zaporozhets 293553747a Cleanup bootstrap variable example file 2015-03-17 22:31:45 -07:00
Dmitriy Zaporozhets 2aaf685305 More use of sass variables. Reject flatly gray colors 2015-03-17 22:25:25 -07:00
Dmitriy Zaporozhets b8b3f7f11c Merge branch 'css-vars' into 'master'
More actively use css variabled to prevent colors duplication

See merge request !1715
2015-03-18 01:37:04 +00:00
Dmitriy Zaporozhets f8c8d988e8 Fix scroll for last push widget 2015-03-17 18:13:20 -07:00
Dmitriy Zaporozhets d659c1d1fd More actively use css variabled to prevent colors duplication 2015-03-17 18:01:33 -07: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
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Dmitriy Zaporozhets 84edc020b2 Fix button color inside alert 2015-03-16 23:44:30 -07:00
Dmitriy Zaporozhets 8eebb6e566 Fix editor UI bug 2015-03-16 13:13:02 -07:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Dmitriy Zaporozhets cba6d797d7 Remove ugly highlight styles 2015-03-16 11:12:44 -07: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
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan 5ad35bbe02 Use same layout and interactivity for project members as group members. 2015-03-15 13:55:57 +01:00