682923b79b
Merge branch '3674-hashed-storage-attachments' into 'master'
...
Hashed Storage support for Attachments
See merge request gitlab-org/gitlab-ce!15068
2017-10-31 12:18:47 +00:00
e829d5a084
Merge branch 'add-packagist-project-service' into 'master'
...
Add Packagist project service
See merge request gitlab-org/gitlab-ce!14493
2017-10-31 11:54:49 +00:00
9c41c7ac1e
Make `#hashed_storage?` require feature argument
2017-10-31 12:13:48 +01:00
6a4534b62f
Code Style changes and `hashed_storage?` now receives optional feature
2017-10-31 02:00:40 +01:00
609f4048dd
Merge branch 'make-merge-jid-handling-less-stateful' into 'master'
...
Fix widget of locked merge requests not being presented
See merge request gitlab-org/gitlab-ce!15069
2017-10-30 11:18:04 +00:00
f03700f5e4
Merge branch '39366-email-confirmation-fails' into 'master'
...
grab the correct username when confirming secondary email
Closes #39366
See merge request gitlab-org/gitlab-ce!15010
2017-10-30 08:53:24 +00:00
a6c52c4e59
Make merge_jid handling less stateful in MergeService
2017-10-27 22:33:48 +02:00
b19076948d
Moved renaming operations to storage layer abstraction
...
When project storage_version is `2` means attachments are using
hashed storage.
2017-10-27 21:27:17 +02:00
57d7ed05d9
Fetch the merged branches at once
2017-10-27 15:55:08 +00:00
34254e1d58
remove extra whitespace
2017-10-27 17:35:40 +02:00
a2894b7ad2
use a delegate for `username` to be more future friendly
2017-10-27 16:32:48 +02:00
15e3d33761
Merge branch 'zj-commit-cache' into 'master'
...
Cache commits on the repository model
See merge request gitlab-org/gitlab-ce!14863
2017-10-27 13:31:05 +00:00
172ebcb8bb
Merge branch 'ac-k8s-namespace-validator' into 'master'
...
Sanitize k8s default_namespace
Closes #38692
See merge request gitlab-org/gitlab-ce!15053
2017-10-27 12:04:22 +00:00
3411fef1df
Cache commits on the repository model
...
Now, when requesting a commit from the Repository model, the results are
not cached. This means we're fetching the same commit by oid multiple times
during the same request. To prevent us from doing this, we now cache
results. Caching is done only based on object id (aka SHA).
Given we cache on the Repository model, results are scoped to the
associated project, eventhough the change of two repositories having the
same oids for different commits is small.
2017-10-27 12:49:11 +02:00
3aafcc16fb
Add KubernetesService#default_namespace tests
2017-10-26 18:18:11 +02:00
6798bab12a
Remove duped tests
...
Likely caused by EE conflicts resolution
2017-10-26 16:04:28 +02:00
cd08fd2363
Merge branch 'non-existing-repo-optimization' into 'master'
...
Avoid calling underlying methods on non-existing repos
See merge request gitlab-org/gitlab-ce!14962
2017-10-26 11:29:46 +00:00
c29d2c6a41
Merge branch 'api-configure-jira' into 'master'
...
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
2017-10-26 11:20:48 +00:00
294f40e2c8
Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
...
Closes #25142
2017-10-25 23:51:26 +03:00
3dcdd4a1e8
Merge branch 'sh-fix-environment-write-ref' into 'master'
...
Fix the writing of invalid environment refs
Closes #39182
See merge request gitlab-org/gitlab-ce!14993
2017-10-24 09:22:21 +00:00
cc5ba3d907
Validate username/pw for Jiraservice, require them in the API
2017-10-24 10:35:21 +03:00
1881d4f8ec
Allow configuring new circuitbreaker settings from the UI and API
2017-10-23 12:02:23 +03:00
3bff85a4f6
Fix the writing of invalid environment refs
...
Environment names that contained a space would cause an error
in GitLab 10.1 because a new guard clause was introduced in
Repository#write_ref to prevent such references from
existing. Use the slug instead to ensure that the name
is valid.
Closes #39182
2017-10-23 04:15:26 +03:00
3c0be3cd41
Fix the external URLs generated for online view of HTML artifacts
2017-10-20 23:38:35 +01:00
81175d2c37
Merge branch 'fix-application-setting-nil-cache' into 'master'
...
Prevent ApplicationSetting to cache nil value
Closes #39275
See merge request gitlab-org/gitlab-ce!14952
2017-10-20 19:20:29 +00:00
6d04f3789c
Avoid calling underlying methods on non-existing repos
...
This saves us Rugged/gRPC invocations
2017-10-20 12:58:49 -03:00
64fd9814fd
Prevent ApplicationSetting to cache nil value
2017-10-19 15:07:35 +03:00
ed194a6d4a
Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Wiki#write_page to Gitaly
Closes gitaly#638
See merge request gitlab-org/gitlab-ce!14870
2017-10-18 11:13:50 +00:00
891a9ce8b0
Merge branch 'master' into sh-security-fix-backports-master
2017-10-17 16:02:32 -07:00
bd46c8abfd
Merge branch 'security-10-1' into '10-1-stable'
...
Security fixes for 10.1 RC
See merge request gitlab/gitlabhq!2209
2017-10-17 15:58:58 -07:00
65a1cbc600
Merge branch 'prevent-creating-multiple-application-settings' into 'master'
...
Prevent creating multiple ApplicationSetting by forcing it to always have id=1
Closes #34728
See merge request gitlab-org/gitlab-ce!14718
2017-10-17 13:53:42 +00:00
4bbdab764d
Merge branch 'bvl-circuitbreaker-improvements' into 'master'
...
Make the circuitbreaker configurable at runtime
See merge request gitlab-org/gitlab-ce!14842
2017-10-17 10:43:05 +00:00
79e889122b
Merge branch 'bvl-group-trees' into 'master'
...
Show collapsible tree on the project show page
Closes #30343
See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
38af7c1613
Allow configuring the circuitbreaker through the API and UI
2017-10-17 11:50:32 +02:00
fa5eeaecfb
Migrate Gitlab::Git::Wiki#write_page to Gitaly
...
Closes gitaly#638
2017-10-16 15:53:48 +02:00
915120a60f
Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' into 'master'
...
Resolve "Remove "Build failed" TODO if it has been auto-retried"
Closes #38236
See merge request gitlab-org/gitlab-ce!14869
2017-10-16 12:14:42 +00:00
b2553840e8
Merge branch 'conflict-resolution-refactor' into 'master'
...
Conflict resolution refactor
See merge request gitlab-org/gitlab-ce!14747
2017-10-16 10:36:06 +00:00
6247886405
Don't create build failed todo when build is retried
...
When a build is retried automatically, we close any open todos. However, we do
that _before_ creating a new build failed todo.
To solve this, we check if the build is retried before creating the todo. We
also ensure that the build _instance_ has the correct attribute set, without
needing to reload it from the database.
2017-10-16 11:10:07 +01:00
c909b6aa6d
Prevent creating multiple ApplicationSetting by forcing it to always have id=1
2017-10-16 10:19:18 +02:00
076231798d
Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'
...
Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`
Closes #38960
See merge request gitlab-org/gitlab-ce!14807
2017-10-16 08:12:46 +00:00
c207122fd2
Add Packagist project service
2017-10-13 13:42:53 -04:00
96d8c7fff1
Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'
...
Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory
Closes #37571
See merge request gitlab-org/gitlab-ce!14850
2017-10-13 13:58:47 +00:00
c30f92464e
Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory
...
We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs.
2017-10-13 14:42:52 +02:00
0aff29f96b
Merge Merge Requests via Gitaly
2017-10-13 14:07:31 +02:00
c616200f82
Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'
...
Make "merge ongoing" check more consistent
Closes #39032
See merge request gitlab-org/gitlab-ce!14825
2017-10-13 11:10:47 +00:00
b78954c13d
Simplify check for running job on Redis
2017-10-13 10:17:41 +02:00
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
b7303b65b1
Cache issuable template names
...
We were looking these up on each request to an issue page, because the form is
pre-filled, as is the template dropdown. That was unnecessary: we could just
treat these as 'special' repository files (like the rendered README) and cache
them in Redis until they change on a push.
2017-10-12 13:26:03 +01:00
Douwe Maan
Kamil Trzciński
Gabriel Mazetto
Sean McGivern
Oswaldo Ferreira
Lin Jen-Shin (godfat)
Brett Walker
Rémy Coutable
Zeger-Jan van de Weg
Alessio Caiazza
Francisco Lopez
Grzegorz Bizon
Robert Schilling
Bob Van Landuyt
Stan Hu
Nick Thomas
Winnie Hellmann
Alejandro Rodríguez
Jen-Shin Lin
Yorick Peterse
Ahmad Sherif
Sean McGivern
Matt Coleman
Jacopo
Jacob Vosmaer