Commit Graph
27152 Commits
Author SHA1 Message Date
Yorick Peterse dcd4829cc7 Version 8.7.0-rc6 v8.7.0-rc6 2016-04-20 11:14:35 +02:00
Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 10:50:27 +02:00
Rémy CoutableandYorick Peterse aa49124ef4 Merge branch 'feature/raw-trace-output' into 'master'
Add raw build trace output

Closes #15308, #15147

Changes in the UI:

- on finished build:

    ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)

- on running build:

    ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)

See merge request !3767
2016-04-20 10:49:56 +02:00
Rémy CoutableandYorick Peterse b255cbf396 Merge branch 'slack_wiki_notifications' into 'master'
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

## Are there points in the code the reviewer needs to double check?

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
2016-04-20 10:49:31 +02:00
Robert SpeicherandYorick Peterse 413ff5b3ce Merge branch 'issue_15390' into 'master'
Fix javascript errors with invalid json because of commas

fixes #15390 

See merge request !3827
2016-04-20 10:48:22 +02:00
Robert SpeicherandYorick Peterse e2903f28e5 Merge branch '15139-fix-constants-redefinition-warnings' into 'master'
Define constants only if not defined yet and freeze them

Fixes #15139.

See merge request !3810
2016-04-20 10:47:48 +02:00
Robert SpeicherandYorick Peterse b0bb561494 Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 22:08:45 +02:00
Sytse SijbrandijandYorick Peterse 118daa7020 CLearify shared runner warning. 2016-04-19 22:01:51 +02:00
Douglas Barbosa AlexandreandYorick Peterse c50f2e155b Fix GitHub project's link on import page when provider has a custom URL 2016-04-19 19:20:02 +02:00
P.S.V.RandYorick Peterse fd4c833367 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-19 19:19:00 +02:00
Ben BodenmillerandYorick Peterse 8d1b82acf1 format merge request references properly 2016-04-19 19:18:56 +02:00
Yorick Peterse f6fbd0fb84 Merge branch 'master' into 8-7-stable
In doing this I'm breaking my own rules of not merging master into a
stable branch during the feature freeze. I'm breaking this rule for two
reasons:

1. Somewhere down the line I messed up picking commits into the stable
   branch and as a result I basically can't merge anything anymore
   without resolving 9000 merge conflicts.

2. All merge requests merged into master had the "Pick into Stable"
   label anyway except for one commit that bumps the version. As such
   merging master into this branch is not really different from picking
   things manually.
2016-04-19 18:57:10 +02:00
Robert Speicher 18a8844fa0 Merge branch '14566-confidential-issue-branches' into 'master'
Sanitize branch names for confidential issues

- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`.
- The behaviour for non-confidential issues stays the same.

Closes #14566

See merge request !3671
2016-04-19 16:15:50 +00:00
Rémy Coutable a04e5b4e1b Merge branch 'toggle-points-per-packet' into 'master'
Configuring of points per UDP packet

Related to https://gitlab.com/gitlab-com/operations/issues/195. This option would allow us to experiment with finding a good balance between points-per-packet and the UDP packet size.

cc @pcarranza 

See merge request !3816
2016-04-19 15:49:00 +00:00
Yorick Peterse af06431cef Merge branch 'bump-version' into 'master'
Bump version to 8.8.0-pre

See merge request !3809
2016-04-19 15:42:06 +00:00
Dmitriy Zaporozhets eb467aeb7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-19 17:39:15 +02:00
Hannes Rosenögger 9bab098455 Merge branch 'patch-1' into 'master'
"git lfs init" is deprecated, use "git lfs install" instead.

Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used.


See merge request !3779
2016-04-19 15:35:33 +00:00
Douwe Maan 60942bf581 Merge branch 'rs-issue-15126' into 'master'
Remove persistent XSS vulnerability in `commit_person_link` helper

Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

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

See merge request !1948
2016-04-19 15:16:00 +00:00
Jacob Schatz 0063194ad6 Merge branch 'profile-aside-toggle' into 'master'
Removed aside toggle on profile pages

Closes #13943

See merge request !3796
2016-04-19 14:05:28 +00:00
Jacob Schatz 2011f02b5d Merge branch 'dropdown-filter-after-load' into 'master'
Trigger filtering after ajax is complete in dropdown

![filter](/uploads/1c361d968769eb3fe5cdd05dee497aa6/filter.gif)

Closes #15186

See merge request !3813
2016-04-19 13:15:54 +00:00
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
Phil Hughes d1b2e7b440 Trigger filtering after ajax is complete in dropdown
Closes #15186
2016-04-19 10:26:07 +01: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 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
Dmitriy Zaporozhets c634d37086 Bump version to 8.8.0-pre
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 10:36:14 +02:00
Timothy Andrew f801e2243d A new branch created for a confidential issue is named <id>-confidential-issue. 2016-04-19 09:22:55 +05:30
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