Commit Graph
14005 Commits
Author SHA1 Message Date
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
2016-04-19 14:35:25 +02:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master'
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
2016-04-19 12:15:59 +00:00
Kamil Trzcinski d58d88fbd5 Use different markdown 2016-04-19 07:39:53 -04:00
Douwe Maan 1532d202f1 Merge branch 'fix/link-group-permissions' into 'master'
Check permissions when sharing project with group

## Summary

Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15330

## Fix

This change introduces additional check for group read access.

## Further work

We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD).

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15330

See merge request !1949
2016-04-19 11:36:57 +00:00
Dmitriy Zaporozhets 51b777fa9c Merge branch 'dz/system-hooks-ui' into 'master'
Allow enable/disable push events for system hooks in UI

Improvement for !3744 

Fixes #15284 

See merge request !3812
2016-04-19 10:17:51 +00:00
Grzegorz Bizon 66b6d82a3e Use guard clause to check ability to share project 2016-04-19 12:15:56 +02:00
Grzegorz Bizon d177abb32b Refactor method that shares project with a group 2016-04-19 12:15:56 +02:00
Grzegorz Bizon f2e3868124 Check permissions when sharing project with group
Closes #15330
2016-04-19 12:15:56 +02:00
Dmitriy Zaporozhets 45525edd5b Add push events to permit params in system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 11:42:39 +02:00
Dmitriy Zaporozhets 161a419e3c Merge branch 'feature/system_hook_push' into 'master'
Added System Hooks for push and tag_push

Implements `push` and `tag_push` events for System Hooks.

They are based on Webhooks Events but without any deprecated item. We don't send commits too.
We are implementing this, to be used by Geo repository syncing (gitlab-org/gitlab-ee#76).

These hook events will be sent only when the respective configuration flags are set to true.
UI changes to admin screen will be made in another MR.

See merge request !3744
2016-04-19 09:34:47 +00:00
Dmitriy Zaporozhets 8614ff7584 Allow enable/disable push events for system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 11:08:26 +02:00
Gabriel MazettoandDmitriy Zaporozhets f6fa18668a moving overlapping scopes to webhook 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets 5330af3fa6 Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets 2384bed4d8 Refactor GitTagPushService and fig tags_push system event hook 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets ee1090e2b2 Added System Hooks for push and tag_push
Code is based on Project Webhooks, removing deprecations and without
commits listing.
2016-04-19 11:00:30 +02:00
Yorick Peterse 2234ac520b Merge branch 'auto-fsck-skip-wiki' into 'master'
Improve 'auto fsck' feature

- skip wiki repositories when they are disabled (avoids false alarms)
- more context in admin alert emails

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15332

See merge request !3781
2016-04-19 09:00:01 +00:00
Robert Speicher 387b025d15 Merge branch 'gh-keep-issues-prs-references' into 'master'
Use GitHub Issue/PR number as iid to keep references

Closes #15294 

See merge request !3759
2016-04-18 19:32:23 +00:00
Jacob Schatz 09d2da2091 Merge branch 'dropdown-filter-select' into 'master'
Fixed issue with multi select not working with arrow keys



See merge request !3792
2016-04-18 19:14:40 +00:00
Jacob Schatz 4c59557f94 Merge branch '645-profile-update-bug' into 'master'
Add null check to formData.append

Fixes https://gitlab.com/gitlab-com/support-forum/issues/645

See merge request !3799
2016-04-18 19:08:42 +00:00
Jacob Schatz bf41703fd2 Merge branch 'change_target_branch_link_color' into 'master'
Change the link color of the target branch in a merge rquest

closes #15296

See merge request !3786
2016-04-18 19:02:13 +00:00
Jacob Schatz bd65a2f6b2 Merge branch 'mobile-header-overlap' into 'master'
Fixed overlap in header on mobile

![Screen_Shot_2016-04-18_at_08.48.29](/uploads/8f371d0c717a57ca7afb29415e13d96c/Screen_Shot_2016-04-18_at_08.48.29.png)

See merge request !3777
2016-04-18 18:44:15 +00:00
Jacob Schatz f18c613383 Merge branch 'dropzone-class-remove' into 'master'
Removes dropzone focus class after dropping file



See merge request !3756
2016-04-18 18:37:00 +00:00
Jacob Schatz 96b6cf9308 Merge branch 'note-form-focus-color' into 'master'
Updated note form focus to better match form-control focus

![Screen_Shot_2016-04-15_at_09.47.52](/uploads/39e02f79a72798ecc6dc946c7b3c8e2e/Screen_Shot_2016-04-15_at_09.47.52.png)

See merge request !3739
2016-04-18 18:36:26 +00:00
Jacob Schatz ec74ae0616 Merge branch 'parallel-diff' into 'master'
Wrap code in parallel view

Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode

<img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px">

See merge request !3731
2016-04-18 18:26:14 +00:00
Jacob Schatz e4f1d1367b Merge branch 'commit-timeago-fix' into 'master'
Fixed issue with commit time not using timeago



See merge request !3723
2016-04-18 18:05:53 +00:00
Annabel Dunstone beb32f31fb Add null check to formData.append 2016-04-18 13:04:36 -05:00
Phil Hughes 872d31d6e9 Fixed issue with spinner not hiding on diff changes 2016-04-18 16:56:48 +01:00
Phil Hughes ea71145418 Fixed issue with multi select not working with arrow keys 2016-04-18 16:45:49 +01:00
Douglas Barbosa Alexandre d13bba44f0 Use GitHub Issue/PR number as iid to keep references
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
2016-04-18 12:15:50 -03:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur 7d54e721da Insert instructions in admin page and permissions document 2016-04-18 11:12:28 -03:00
Felipe Artur 09c8cf9de6 Remove group members check 2016-04-18 11:12:28 -03:00
Felipe Artur ce96d482d9 Insert users check into api 2016-04-18 11:12:27 -03:00
Felipe Artur 07b38c3b38 Code fixes 2016-04-18 11:12:27 -03:00
Felipe Artur 147879ae66 Fix specs 2016-04-18 11:12:27 -03:00
Felipe Artur e8a77c0aee Fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 668d6ffa43 Add specs and fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 57519565f1 Move verification to abilities 2016-04-18 11:12:27 -03:00
Felipe Artur b05f0a4858 Restrict user profiles based on restricted visibility levels 2016-04-18 11:11:36 -03:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Jacob Schatz 5ae4fd2181 Merge branch 'tasklist-fix' into 'master'
Fixed issue with tasklist toggling sidebar refresh

Closes #15270

See merge request !3782
2016-04-18 13:37:27 +00:00
Jacob Schatz 2c8c898318 Merge branch 'import-feedback' into 'master'
Added loading icon to import buttons

See #14488 for more details

See merge request !3662
2016-04-18 13:30:16 +00:00
Jacob Schatz d337d27e1c Merge branch 'print-style' into 'master'
Print style

[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)

Closes #14201

See merge request !3784
2016-04-18 13:29:13 +00:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master'
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
2016-04-18 13:03:24 +00:00
Phil Hughes fe3ac403b9 Addressed feedback 2016-04-18 13:45:26 +01:00
Grzegorz Bizon 06952aaf24 Merge branch 'feature/ci-job-env-variables' into 'master'
Add environment variables on a job level in CI

Make it possible to define environment variables on a job level.

Closes #14716

See merge request !3612
2016-04-18 12:28:19 +00:00
Dmitriy Zaporozhets 2b8fc1387b Merge branch 'edit-last-comment' into 'master'
Scroll to the last comment I made and edit it.

Pressing up in an empty comment box will edit your last comment. 

Also now when you click edit on a comment it will put the cursor at the end.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15267

![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif)

See merge request !3757
2016-04-18 11:49:42 +00:00
Arinde Eniola 0592112c6e change the link color of the target branch in a merge rquest 2016-04-18 12:36:15 +01:00
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
2016-04-18 13:17:48 +02:00
Grzegorz Bizon 3dec6e2629 Rename method that returns global envs in CI conf 2016-04-18 13:17:48 +02:00