Commit Graph
1632 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fec5f807bb Merge branch 'new-branch-commits' into 'master'
List new commits for newly pushed branch in activity view.

When someone pushes commits, I want to see them, regardless if it's a new or existing branch. If it's a new branch, we compare with the default branch (usually master).

![Screen_Shot_2015-03-17_at_15.49.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4cb7e0d833bc83a30197db81d4b273bc/Screen_Shot_2015-03-17_at_15.49.13.png)

See merge request !1711
2015-03-18 17:47:02 +00:00
Douwe Maan 9d938fd77d List new commits for newly pushed branch in activity view. 2015-03-18 14:28:50 +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 63d0bf1f5e Fix external wiki service 2015-03-17 22:59:45 -07:00
Dmitriy Zaporozhets 066fb568e7 Align services like in EE for easier merging 2015-03-17 19:06:43 -07:00
Dmitriy Zaporozhets 52acd2b45c Merge branch 'external_wiki' into 'master'
Add support for external wikis

## What does this MR do?
This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link.
Currently this is realised as a service.

## What Use Case does this MR solve?
In my Company we already have a wiki System (Confluence).
We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides.
This currently only leaves us two choices:
1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui.
2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one.

Both solutions are not really good.
So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab?
Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :)
This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki.

## Screenshot:
![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png)

See merge request !291
2015-03-18 02:00:36 +00:00
Dmitriy Zaporozhets bfc8ded120 Merge branch 'last-deploy-key' into 'master'
Delete deploy key when last connection to a project is destroyed.

Addresses #1959.

See merge request !1710
2015-03-17 16:49:38 +00: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
Douwe Maan 9c7fffb655 Delete deploy key when last connection to a project is destroyed. 2015-03-17 14:55:43 +01:00
Vinnie Okada 2e672c39a0 Fix restricted visibility bugs
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.
2015-03-16 13:59:50 -06:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02: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 f53683e67f fix specs 2015-03-16 16:51:49 +02:00
Valery Sizov 410d25c8ca rename table subscribe; make it polymorfic 2015-03-16 15:22:50 +02:00
Valery Sizov 09ef69b7c8 code folding fix 2015-03-16 13:52:55 +02:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan e97cdb042d Remove old team scopes. 2015-03-15 13:50:38 +01:00
Douwe Maan bbdf23261c Use member instead of tm. 2015-03-15 13:50:38 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility
Conflicts:
	db/schema.rb
2015-03-14 10:49:11 -06:00
Vinnie Okada 5710c1aaf8 Update snippet authorization
Allow authors and admins to update the visibility level of personal and
project snippets.
2015-03-14 10:30:48 -06:00
Douwe Maan f96dc6295a Everything from gitlab_git is already UTF-8. 2015-03-13 13:49:27 +01:00
Drew Blessing 606d24ff2d Merge branch 'irker-service-use-supported-events' into 'master'
Make Irker service check supported_events

63178a9509 added the supported_events check for services. Since f84b7eef3f was just added, we should adjust it accordingly.

See merge request !367
2015-03-13 00:41:07 +00:00
Hannes Rosenögger 7ff9c8229d Add a service to support external wikis 2015-03-12 19:13:51 +01:00
Marin Jankovski 6d0ff0ade8 Remove placeholder methods to prevent calling methods rather than attributes. 2015-03-10 18:09:13 -07:00
Dmitriy Zaporozhets 961971544a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-10 12:03:58 -07:00
Marin Jankovski 82bb3ec33d Merge branch 'issues-tracker-id' into 'master'
Properly move over `issues_tracker_id` from old custom issue tracker URLs.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124.

cc @marin Regression in 7.8.0.

See merge request !1670
2015-03-10 17:07:49 +00:00
Douwe Maan 76842aac75 Properly move over issues_tracker_id from old custom issue tracker URLs. 2015-03-10 14:14:49 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Douwe Maan 94a955893c Merge branch 'fix-commit-calendar-emails' into 'master'
Fix commit calendar to use all user emails

This MR improves upon Hannes Rosenögger's changes:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/364

See merge request !378
2015-03-10 08:58:35 +00:00
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account.
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
2015-03-09 21:43:54 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push'
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
2015-03-08 16:49:11 -07:00
Vinnie Okada 285c534185 Allow admins to override restricted visibility
Allow admins to use restricted visibility levels when creating or
updating projects.
2015-03-08 16:10:05 -06:00
Vinnie Okada cacac147de Move restricted visibility settings to the UI
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
2015-03-07 13:11:08 -07:00
Dmitriy Zaporozhets e68ad7fbb8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 16:13:43 -08:00
Dmitriy Zaporozhets 7dadd423d5 Merge branch 'condensed-mr-commits' into 'master'
Condense commits already in target branch when updating merge request source branch.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.

![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png)

(Not shown in screenshot, but works fine with rebases as well)

See merge request !1648
2015-03-07 00:13:10 +00:00
Douwe Maan 84ebc22ad2 Use 2 periods instead of 3 to signify inclusive range. 2015-03-06 23:12:26 +01:00
Douwe Maan 663b3c968f Condense commits already in target branch when updating merge request source branch. 2015-03-06 18:09:00 +01:00
Stan Hu ad14ed5e49 Add tag_push event notification to HipChat and Slack services.
Normalize output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"
2015-03-06 08:31:49 -08:00
Stan Hu 7e204cf389 Added comment notification events to HipChat and Slack services.
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
2015-03-06 06:54:00 -08:00
Stan Hu f12ec5f4e8 Add merge and issue event notification for HipChat 2015-03-05 08:23:38 -08:00
Stan Hu 6ddd45948f Make Irker service use the supported events check 2015-03-04 22:31:28 +00:00
Dmitriy Zaporozhets 66c61f023b Re-annotate models 2015-03-04 14:14:00 -08:00
Dmitriy Zaporozhets 63178a9509 Merge branch 'add-more-slack-notifications' into 'master'
Add more Slack notifications for issue and merge request events

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu.

See merge request !1556
2015-03-04 21:57:17 +00:00
Marin Jankovski e6a0fb1f77 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-03 11:50:21 -08:00
Hannes Rosenögger 10212c01fd Count commits in branches as well in the commit calendar 2015-03-03 15:31:05 +01:00
Douwe Maan d57e809cbd Set supported events per project service. 2015-03-03 11:14:32 +01:00
Douwe Maan 85fa334eb6 Execute GitlabCiService for both push and tag_push events. 2015-03-03 11:14:32 +01:00