Commit graph

1744 commits

Author SHA1 Message Date
Sean McGivern
ee908e2382 Merge branch 'refactor.notification-recipient-builders' into 'master'
Refactor.notification recipient builders

See merge request 
2017-08-04 09:54:52 +00:00
Sean McGivern
db271a6b05 Merge branch 'tc-no-todo-service-select-mysql' into 'master'
Avoid plucking Todo ids in TodoService - take 2

See merge request 
2017-08-03 18:46:49 +00:00
http://jneen.net/
6aa44382ac rm a now-useless spec 2017-08-03 09:07:18 -07:00
http://jneen.net/
b05e6efd53 add builder helpers with levels and start to separate out #filter! 2017-08-03 09:06:15 -07:00
Toon Claes
a723cba574 Avoid plucking Todo ids and use sub-queries instead
TodoService should not call `.select(&:id)` on todos, because this is
bad performance. So instead use sub-queries, which will result in a
single SQL query to the database.

https://docs.gitlab.com/ee/development/sql.html#plucking-ids
2017-08-03 16:31:05 +02:00
Lin Jen-Shin
bb5f79d43e Don't include EmailHelpers manually, pick with rspec
`:mailer` is needed to pick it easily, while
`type: :mailer` is needed for picking it automatically for
tests located in spec/mailers/*_spec.rb

It's a bit complicated in spec/services/notification_service_spec.rb
but we'll leave it alone for now.
2017-08-03 21:55:48 +08:00
Robert Speicher
72a7b30c9f Change all :empty_project to :project 2017-08-02 17:47:31 -04:00
Toon Claes
35081a77b0 Make Delete Merged Branches handle wildcard protected branches correctly
The "Delete Merged Branches" button should filter out protected
branches matching the wildcard patterns.

Closes .
2017-08-02 14:45:54 +02:00
Rémy Coutable
0bc1dfb6d5 Merge branch 'rs-empty_project-cleanup' into 'master'
Ensure all project factories use `:repository` trait or `:empty_project`

See merge request 
2017-08-02 09:45:42 +00:00
Dmitriy Zaporozhets
6e8703440e Merge branch '35815-webhook-log-encoding-error' into 'master'
Fix encoding error for WebHook logging

Closes 

See merge request 
2017-08-02 08:53:49 +00:00
Robert Speicher
9513bd18c4 Ensure all project factories use :repository trait or :empty_project 2017-08-01 14:51:52 -04:00
Alexander Randa
0135d57b01 Fix encoding error for WebHook logging 2017-08-01 20:19:59 +03:00
Sean McGivern
90cb2aab38 Merge branch '28283-legacy-storage-format' into 'master'
[CE] Added Legacy Storage format

See merge request 
2017-08-01 12:24:24 +00:00
Shinya Maeda
d608aa5846 fix 2017-08-01 17:42:05 +09:00
Gabriel Mazetto
fb06a4d8fe Rename more path_with_namespace -> full_path or disk_path 2017-08-01 07:28:13 +02:00
Gabriel Mazetto
c6dee99803 Rename path_with_namespace -> disk_path when dealing with the filesystem 2017-08-01 07:26:58 +02:00
Gabriel Mazetto
abb878326c Rename many path_with_namespace -> full_path 2017-08-01 07:26:58 +02:00
Rémy Coutable
2519027442 Merge branch 'avoid-expect_any_instance_of' into 'master'
Avoid expect_any_instance_of in transfer service spec

See merge request 
2017-07-31 15:35:55 +00:00
Rémy Coutable
0d52e59de4 Merge branch '29385/add_shrug_command' into 'master'
Fixes : Add /shrug and /tableflip commands

Closes 

See merge request 
2017-07-31 14:02:00 +00:00
Lin Jen-Shin
b720c22fb4 Avoid expect_any_instance_of because it doesn't work
well with prepend. We need to backport this
2017-07-31 20:33:21 +08:00
Alex Ives
a07fe9d7f8 Fixes : Add /shrug and /tableflip commands
- Updated DSL to support substitution definitions
- Added substitution definition, inherits from command definition
- Added tabelflip and shrug substitutions to interpret service
- Added support for substitution definitions to the extractor for preview mode.
- Added substitution handling in the interpret service

Signed-off-by: Alex Ives <alex@ives.mn>
2017-07-28 14:37:44 -05:00
Robert Speicher
b2f9160298 De-duplicate two specs in spec/services/notification_service_spec
There were two specs that were testing the exact same thing as the spec
above it, but with additional expectations. So we opted to keep the
"more expectations" tests and deleted the duplicates.

We've also deleted one nested `before` block that was duplicating setup
of its parent context.
2017-07-28 15:20:49 -04:00
Robert Speicher
0bb58ff885 Merge branch 'dm-large-push-performance' into 'master'
Load and process at most 100 commits when pushing into default branch

Closes 

See merge request 
2017-07-28 17:03:17 +00:00
Douwe Maan
0e355e5c92 Load and process at most 100 commits when pushing into default branch 2017-07-28 17:23:13 +02:00
Sean McGivern
883be9c67b Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'
Merge issuable "reopened" state into "opened"

See merge request 
2017-07-28 15:15:38 +00:00
Rémy Coutable
ad6487cec8 Merge branch 'log_webhook_timeout' into 'master'
Log web hook execution timeout events

See merge request 
2017-07-28 15:06:15 +00:00
Kamil Trzciński
fa1e41ea64 Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'
Follow-up from "Allow to use cross project pipelines" ver 2

Closes , gitlab-ee#2604, and 

See merge request 
2017-07-28 11:43:00 +00:00
Yorick Peterse
6ef87a2083
Merge issuable "reopened" state into "opened"
Having two states that essentially mean the same thing is very much like
having a boolean "true" and boolean "mostly-true": it's rather silly.
This commit merges the "reopened" state into the "opened" state while
taking care of system notes still showing messages along the lines of
"Alice reopened this issue".

A big benefit from having only two states (opened and closed) is that
indexing and querying becomes simpler and more performant. For example,
to get all the opened queries we no longer have to query both states:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state IN ('opened', 'reopened');

Instead we can query a single state directly, which can be much faster:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state = 'opened';

Further, only having two states makes indexing easier as we will only
ever filter (and thus scan an index) using a single value. Partial
indexes could help but aren't supported on MySQL, complicating the
development process and not being helpful for MySQL.
2017-07-28 13:31:51 +02:00
Douwe Maan
850a22547c Merge branch 'zj-delete-mm-team' into 'master'
Remove Mattermost team with GitLab group

Closes 

See merge request 
2017-07-28 09:58:20 +00:00
Shinya Maeda
dca9bd9e69 Expand pipeline_trigger_service_spec by godfat request 2017-07-28 18:46:04 +09:00
Shinya Maeda
b59abf5b44 Use let(:params) instead of def param 2017-07-28 18:13:30 +09:00
Shinya Maeda
48389e9944 Fix pipeline 2017-07-28 18:13:29 +09:00
Shinya Maeda
56418e85ac init 2017-07-28 18:13:29 +09:00
Z.J. van de Weg
d7062dd042
Remove Mattermost team with GitLab group
When destroying a group, now an API call is made to the Mattermost
server to request the deletion of the project. Actual team deletion on
the Mattermost side happens async, so the runtime shouldn't increase by
more than a second.
2017-07-28 09:09:55 +02:00
Tiago Botelho
1cd43c3890 refactors git push service spec code 2017-07-28 08:07:45 +02:00
Dmitriy Zaporozhets
ac0cbe6970 Merge branch 'feature/gpg-signed-commits' into 'master'
GPG signed commits

Closes 

See merge request 
2017-07-27 15:29:39 +00:00
Alexis Reigel
e63b693f28 generate gpg signature on push 2017-07-27 15:43:37 +02:00
Alexis Reigel
c1281982bd notification email on add new gpg key 2017-07-27 15:40:41 +02:00
Alex Lossent
a94e91a45b Log web hook execution timeout events
If a web hook HTTP request is sent but no response comes
within a certain time (10s by default), the hook execution fails
and will be retried. This commit makes such timeouts visible
in the web hook log, like connection timeouts already are.

Also log "no route to host" errors.
2017-07-27 15:02:25 +02:00
Rémy Coutable
cddc5cacfb Use described_class when possible
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:53 +02:00
Rémy Coutable
ddccd24c13 Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:53 +02:00
Kamil Trzciński
0c563225b6 Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'
Handle maximum pages artifacts size correctly

Closes 

See merge request 
2017-07-26 14:00:42 +00:00
Sean McGivern
5de3ec64da Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'
Handle errors while a project is being deleted asynchronously.

Closes 

See merge request 
2017-07-26 12:49:54 +00:00
Tiago Botelho
b5bdc55d23 Move exception handling to execute 2017-07-26 12:47:50 +01:00
Kamil Trzciński
ac948684fc Merge branch '30634-protected-pipeline' into 'master'
Implement "Block pipelines on protected branches"

Closes , , and 

See merge request 
2017-07-25 15:04:23 +00:00
Grzegorz Bizon
7151fb754b Fix rubocop offense in update pages service specs 2017-07-25 13:47:03 +02:00
Grzegorz Bizon
77a6ec22ba Handle maximum pages artifacts size correctly 2017-07-25 12:45:45 +02:00
Rémy Coutable
d5801545ec Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into 'master'
New `/duplicate` quick action

Closes 

See merge request 
2017-07-25 09:30:15 +00:00
Sean McGivern
6d13bc5863 Merge branch '33097-issue-tracker' into 'master'
Associate Issues tab only with internal issues tracker

Closes 

See merge request 
2017-07-24 13:00:33 +00:00
Grzegorz Bizon
4ad8f12e44 Fix editing project with container images present 2017-07-24 10:47:33 +00:00