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
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
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
Grzegorz Bizon
f2e3868124
Check permissions when sharing project with group
...
Closes #15330
2016-04-19 12:15:56 +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
Gabriel Mazetto and Dmitriy Zaporozhets
5330af3fa6
Using single builder for push and tag events
2016-04-19 11:00:30 +02:00
Gabriel Mazetto and Dmitriy Zaporozhets
2384bed4d8
Refactor GitTagPushService and fig tags_push system event hook
2016-04-19 11:00:30 +02:00
Gabriel Mazetto and Dmitriy 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
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
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
Douglas Barbosa Alexandre
05a4f444c3
Import labels from GitHub
2016-04-18 17:14:59 -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
Robert Schilling
7fa3a1c05c
Ensure that annoation is presented properly
2016-04-18 20:01:32 +02:00
Douwe Maan
58665b64f5
Merge branch 'issue_3508' into 'master'
...
Restrict public users for private instances
Implements #3508
See merge request !3440
2016-04-18 15:20:13 +00: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
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
Kamil Trzcinski
21041525af
Update according to review comments
2016-04-18 09:56:38 -04:00
Kamil Trzcinski
6b124d42d9
Add configurable shared runners text
2016-04-18 09:54:52 -04:00
Kamil Trzcinski
2ab8d3e652
Merge branch 'after-script' into make-before-after-overridable
2016-04-18 09:47:12 -04:00
Kamil Trzcinski
aca1e14bd3
Merge remote-tracking branch 'origin/master' into after-script
2016-04-18 09:46:12 -04:00
Kamil Trzcinski
39c2677e86
Merge remote-tracking branch 'origin/master' into after-script
2016-04-18 09:43:45 -04:00
Yorick Peterse
7e6f0ac0e0
Count the number of SQL queries per transaction
...
Fixes gitlab-org/gitlab-ce#15335
2016-04-18 14:53:13 +02:00
Kamil Trzcinski
42102b4344
Merge branch 'after-script' into make-before-after-overridable
2016-04-18 07:53:21 -04:00
Kamil Trzcinski
63bd1f92d9
Fix rubocop complains
2016-04-18 07:51:49 -04:00
Grzegorz Bizon
1339fda1cd
Minor refactorings in CI config
2016-04-18 13:36:52 +02:00
Grzegorz Bizon
2b1c08be8f
Validate job-level variables in YAML config file
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
cf3e3effb0
Minor refactoring in code related to job variables
2016-04-18 13:17:48 +02: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
bdb06fa043
Improve build specs for job environment variables
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
1f3248644e
Make CI config return empty array if no job variables
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
Grzegorz Bizon
b7946b50fc
Read job variables directly from gitlab CI config
2016-04-18 13:17:48 +02:00
Grzegorz Bizon
b578fbfb85
Make it possible to override build variables
2016-04-18 13:17:47 +02:00
Grzegorz Bizon
a1363d39c6
Add variables keyword to job in CI config YAML
2016-04-18 13:17:47 +02:00
Yorick Peterse
651c3e841d
Instrument Repository.clean_old_archives
2016-04-18 12:33:11 +02:00
Yorick Peterse
7b6785b3b1
Use Module#prepend for method instrumentation
...
By using Module#prepend we can define a Module containing all proxy
methods. This removes the need for setting up crazy method alias chains
and in turn prevents us from having to deal with all that madness (e.g.
methods calling each other recursively).
Fixes gitlab-org/gitlab-ce#15281
2016-04-18 11:16:31 +02:00
Jacob Vosmaer
1394ccfe83
Destroy wikis uniformly
2016-04-18 11:03:53 +02:00
Jacob Vosmaer
fdf6ca6c01
Improve 'auto fsck' admin emails
2016-04-18 10:58:40 +02:00
Jacob Vosmaer
d7a4a2fe75
When a project wiki is disabled skip it for fsck
2016-04-18 10:52:01 +02:00
Rémy Coutable
Kamil Trzciński
Grzegorz Bizon
Dmitriy Zaporozhets
Gabriel MazettoandDmitriy Zaporozhets
Yorick Peterse
Douglas Barbosa Alexandre
Robert Speicher
Robert Schilling
Douwe Maan
Felipe Artur
Jacob Vosmaer