summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-196-24/+40
| | | | | | | | | 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.
* Merge branch 'api-fix-annotated-tags' into 'master' Rémy Coutable2016-04-193-1/+4
|\ | | | | | | | | | | | | | | | | 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
| * Ensure that annoation is presented properlyRobert Schilling2016-04-181-0/+2
| |
| * API: Present an array of Gitlab::Git::Tag instead of array of rugged tagsRobert Schilling2016-04-172-1/+2
| |
* | Merge branch 'docs/notice-about-gitlab-runner' into 'master' Grzegorz Bizon2016-04-192-1/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Add a note about installing Runners in ci/runners/README.mddocs/notice-about-gitlab-runnerAchilleas Pipinellis2016-04-111-1/+5
| | |
| * | Add link to Runner security docAchilleas Pipinellis2016-04-111-4/+14
| | | | | | | | | | | | [ci skip]
| * | Add notice about GitLab Runner to requirements docsGrzegorz Bizon2016-04-041-0/+10
| | | | | | | | | | | | | | | This is related to !14589, and problems that may stem from running GitLab Runner on same machine user installed GitLab web app on.
* | | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-198-4/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
| * | | Use different markdownconfigurable-shared-runners-textKamil Trzcinski2016-04-192-3/+4
| | | |
| * | | Fix CHANGELOGKamil Trzcinski2016-04-181-1/+0
| | | |
| * | | Update according to review commentsKamil Trzcinski2016-04-182-6/+5
| | | |
| * | | Add configurable shared runners textKamil Trzcinski2016-04-188-4/+40
| | | |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-193-4/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| * \ \ \ Merge branch 'fix/link-group-permissions' into 'master' Douwe Maan2016-04-193-4/+59
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Add Changelog entry for group link permissions fixGrzegorz Bizon2016-04-191-0/+3
| | | | | |
| | * | | | Use guard clause to check ability to share projectGrzegorz Bizon2016-04-191-7/+4
| | | | | |
| | * | | | Refactor method that shares project with a groupGrzegorz Bizon2016-04-191-4/+3
| | | | | |
| | * | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-192-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | Closes #15330
* | | | | | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-194-18/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Make rubocop happymake-before-after-overridableKamil Trzcinski2016-04-182-20/+23
| | | | | | |
| * | | | | | Trigger buildsKamil Trzcinski2016-04-180-0/+0
| | | | | | |
| * | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-15/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-1858-360/+960
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-183-29/+38
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOG and add documentationKamil Trzcinski2016-04-172-0/+21
| | | | | | | | | |
| * | | | | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-174-23/+34
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * after-script: Add CHANGELOG and documentation Rename finally_script to after_script Conflicts: lib/ci/gitlab_ci_yaml_processor.rb spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
| * | | | | | | | | | Allow the before_script and finally_script to be overwritten in context of jobKamil Trzcinski2016-04-162-14/+81
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-194-18/+73
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Resolve mergeafter-scriptKamil Trzcinski2016-04-181-15/+0
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1827-114/+363
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1832-246/+597
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Fix rubocop complainsKamil Trzcinski2016-04-182-29/+35
| | | | | | | | |
| * | | | | | | | Add note about versionKamil Trzcinski2016-04-171-0/+3
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Add CHANGELOG and documentationKamil Trzcinski2016-04-172-0/+11
| | | | | | | |
| * | | | | | | Rename finally_script to after_scriptKamil Trzcinski2016-04-172-13/+13
| | |_|/ / / / | |/| | | | |
| * | | | | | Implement finally_script which allows to do cleanups as part of the build ↵Kamil Trzcinski2016-04-162-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | process
* | | | | | | Merge branch 'dz/system-hooks-ui' into 'master' Dmitriy Zaporozhets2016-04-194-13/+37
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow enable/disable push events for system hooks in UI Improvement for !3744 Fixes #15284 See merge request !3812
| * | | | | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Allow enable/disable push events for system hooksDmitriy Zaporozhets2016-04-193-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'fix/prepare-build-in-docker' into 'master' Douwe Maan2016-04-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Fix prepare build execution in docker environmentTomasz Maczukin2016-04-191-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'feature/system_hook_push' into 'master' Dmitriy Zaporozhets2016-04-1915-49/+209
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add CHANGELOG itemfeature/system_hook_pushDmitriy Zaporozhets2016-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | moving overlapping scopes to webhookGabriel Mazetto2016-04-193-5/+3
| | | | | | |
| * | | | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-195-46/+47
| | | | | | |
| * | | | | | Refactor GitTagPushService and fig tags_push system event hookGabriel Mazetto2016-04-193-28/+27
| | | | | | |
| * | | | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-1910-21/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
* | | | | | | Merge branch 'auto-fsck-skip-wiki' into 'master' Yorick Peterse2016-04-196-5/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Destroy wikis uniformlyJacob Vosmaer2016-04-181-2/+6
| | | | | | |
View Lorry Controller Status