Commit Graph

27082 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
Rémy Coutable bfa16dbcfb Merge branch 'api-fix-annotated-tags' into 'master'
API: Present an array of Gitlab::Git::Tag instead of array of rugged tags

The annotated message was always `null` because the wrong array was presented. 

The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. 

See merge request !3764
2016-04-19 12:31:31 +00:00
Grzegorz Bizon fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master'
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
2016-04-19 12:17:48 +00: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
Grzegorz Bizon 58ebcc9e95 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
* 'master' of dev.gitlab.org:gitlab/gitlabhq:
  Add Changelog entry for group link permissions fix
  Use guard clause to check ability to share project
  Refactor method that shares project with a group
  Check permissions when sharing project with group
2016-04-19 13:41:25 +02: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
Kamil Trzciński c7bd7b6dd8 Merge branch 'make-before-after-overridable' into 'master'
Make before_script and after_script overridable

This is makes it possible to overwrite the before_script and after_script at job level.

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771


See merge request !3772
2016-04-19 11:12:40 +00:00
Kamil Trzciński 479f4cccf1 Merge branch 'after-script' into 'master'
Implement after_script which allows to do cleanups as part of the build process

This implements `after_script` in global context.

The `after_script` will be executed always after the job, even if the job were canceled.

This requires changes on Runner side that will be implemented in 1.2.

cc @tmaczukin @grzesiek 


See merge request !3771
2016-04-19 11:11:31 +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 b9e13c2481 Add Changelog entry for group link permissions fix 2016-04-19 12:15:56 +02: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
Douwe Maan f1907ffd34 Merge branch 'fix/prepare-build-in-docker' into 'master'
Fix prepare build execution in docker environment

In newest versions of docker the `/.dockerinit` file doesn't exists any more (https://github.com/docker/docker/pull/19490). And oo our builds are failing, because the `./scripts/prepare_build.sh` script isn't installing required dependencies.

This MR fixes the problem with backward compatibility for oldest docker environments. 

/cc @grzegorz @douwe 

See merge request !1950
2016-04-19 10:04:03 +00:00
Tomasz Maczukin b3a5f63644
Fix prepare build execution in docker environment 2016-04-19 11:57:10 +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
Dmitriy Zaporozhets 8ead3d0d18 Add CHANGELOG item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 11:00:30 +02:00
Gabriel Mazetto f6fa18668a moving overlapping scopes to webhook 2016-04-19 11:00:30 +02:00
Gabriel Mazetto 5330af3fa6 Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
Gabriel Mazetto 2384bed4d8 Refactor GitTagPushService and fig tags_push system event hook 2016-04-19 11:00:30 +02:00
Gabriel Mazetto 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 53a1d705fe Merge branch 'gh-import-milestones' into 'master'
Import milestones from GitHub

Closes #13421

See merge request !3797
2016-04-18 23:55:25 +00:00
Douglas Barbosa Alexandre 0ed0758735 Use double instead of OpenStruct in the Issue/PR formatters specs 2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre 3225f78fdb Update CHANGELOG 2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre f2fe4af19d Set GitHub milestones to Issue/Merge Request that were imported 2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre 06ec511164 Import milestones from GitHub 2016-04-18 20:07:04 -03:00
Robert Speicher 17b60d6818 Merge branch 'gh-import-labels' into 'master'
Import labels from GitHub

Closes #15292

See merge request !3776
2016-04-18 20:50:07 +00:00
Douglas Barbosa Alexandre 696b1e9657 Update CHANGELOG 2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre 7462a8f90a Apply GitHub labels to Issue/Merge Request that were imported 2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre 05a4f444c3 Import labels from GitHub 2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre 5f39729c19 Update octokit gem to version 4.3.0 2016-04-18 17:02:40 -03: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
Kamil Trzcinski 3f66f4470a Make rubocop happy 2016-04-18 15:19:24 -04:00
Kamil Trzcinski 1a8fd9d7a5 Fix CHANGELOG 2016-04-18 15:16:12 -04: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
Robert Speicher 007a683f9c Merge branch 'fix-migrate-repo-size-migration' into 'master'
Use raw SQL commands for 20140502125220 MigrateRepoSize

Partial fix for #15210

See merge request !3789
2016-04-18 18:51:51 +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
Stan Hu f30053ba60 Use raw SQL commands for 20140502125220 MigrateRepoSize
Partial fix for #15210
2016-04-18 11:05:16 -07:00
Annabel Dunstone beb32f31fb Add null check to formData.append 2016-04-18 13:04:36 -05:00
Robert Schilling 7fa3a1c05c Ensure that annoation is presented properly 2016-04-18 20:01:32 +02:00