061be86e05
added specs
2017-11-28 14:43:47 +00:00
94c5ca71b7
Merge branch 'tm/feature/namespace-by-id-api' into 'master'
...
Add new API endpoint - get a namespace by ID
Closes #40254
See merge request gitlab-org/gitlab-ce!15442
2017-11-28 08:57:39 +00:00
74b5036394
Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into 'master'
...
Refactor the way we pass `old associations` to issuable's update services
Closes #40226
See merge request gitlab-org/gitlab-ce!15542
2017-11-28 08:25:18 +00:00
f144cce8ef
Update policies unit tests
...
This commit also makes spec/policies/namespace_policy_spec.rb file
to be compatible with the same file in GitLab EE.
2017-11-27 23:06:43 +01:00
a9212e0f07
Add some unit tests for lib/api/helpers.rb
2017-11-27 23:06:42 +01:00
04ceeac1f6
Merge branch 'backport-epic-fullscreen' into 'master'
...
Backport epic fullscreen
See merge request gitlab-org/gitlab-ce!15437
2017-11-27 20:35:18 +00:00
f8de23e626
Merge branch 'backport-add-epic-sidebar' into 'master'
...
Backport of add-epic-sidebar
See merge request gitlab-org/gitlab-ce!15335
2017-11-27 20:21:53 +00:00
a7f6ab952a
Merge branch '39601-create-issuable-destroy-service' into 'master'
...
Create issue and merge request destroy services
Closes #39601
See merge request gitlab-org/gitlab-ce!15604
2017-11-27 16:16:20 +00:00
6c1a429420
Fix stuck jobs tests
2017-11-27 11:56:15 +01:00
07c7ba1bf4
Allow to drop jobs for deleted projects
2017-11-27 11:56:15 +01:00
7fb1bb01bd
Create issue and merge request destroy services
2017-11-25 22:09:18 +02:00
02dd3b4ed1
static analysis fix
2017-11-24 21:10:00 +01:00
17069a9547
ignore hashed repositories when doing rake gitlab:cleanup:dirs
2017-11-24 19:29:25 +01:00
b355ebc4c9
Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'
...
Fix ProtectedBranch access level validations
See merge request gitlab-org/gitlab-ce!15586
2017-11-24 16:16:31 +00:00
7230a34453
Merge branch 'dm-project-search-performance' into 'master'
...
Drastically improve project search performance by no longer searching namespace name
Closes #40510 and #39623
See merge request gitlab-org/gitlab-ce!15590
2017-11-24 16:10:53 +00:00
8041a87288
Drastically improve project search performance by no longer searching namespace name
2017-11-24 15:57:17 +01:00
96106287db
Deduplicate protected ref human_access_levels
...
Previously these were duplicated so they could be different for push/merge,
but this was no longer necessary after
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
2017-11-24 13:47:03 +00:00
ba62143ac3
Refactor the way we pass `old associations` to issuable's update services
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-24 13:08:25 +01:00
c4d844f08b
Merge branch 'issue_40374' into 'master'
...
Fix WIP system note not being created
Closes #40374
See merge request gitlab-org/gitlab-ce!15528
2017-11-24 09:38:45 +00:00
7e72fcaa09
Prevent 500 error when inspecting job after trigger was removed
2017-11-24 09:20:34 +00:00
89c9d2ad6b
Merge branch 'dm-fix-registry-with-sudo-token' into 'master'
...
Fix pulling and pushing using a personal access token with the sudo scope
Closes #40466
See merge request gitlab-org/gitlab-ce!15571
2017-11-24 09:09:38 +00:00
fad4ab7d56
Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'
...
Update Prometheus Gem version and disable Prometheus method call instrumentation by default.
Closes gitlab-ee#4139 and #40457
See merge request gitlab-org/gitlab-ce!15558
2017-11-24 09:01:12 +00:00
46cd2d93bb
Use feature flag instead of application settigns to control if method calls should be instrumented
2017-11-23 23:39:10 +01:00
0051b5fbcc
Use only real duration to measure method call performance via Prometheus
2017-11-23 23:33:01 +01:00
efe4cab92b
check method timing threshold when observing method performance
2017-11-23 23:33:01 +01:00
5c2c471a83
Fix WIP system note not being created
2017-11-23 17:25:14 -02:00
fdd7a4cb1b
Fix hashed storage for attachments bugs
2017-11-23 17:04:35 +00:00
dd11f0e053
Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'
...
Clean up repository fetch and mirror methods
See merge request gitlab-org/gitlab-ce!15424
2017-11-23 17:01:47 +00:00
97f966c445
Introduce :read_namespace access policy for namespace and group
2017-11-23 17:44:05 +01:00
dfbfd3c7d7
Allow request namespace by ID or path
2017-11-23 17:44:05 +01:00
7a1e93d35b
Rename fetch_refs to refmap
2017-11-23 16:59:58 +01:00
0e6beaf50c
Clean up repository fetch and mirror methods
2017-11-23 16:59:50 +01:00
d22c885743
Merge branch 'fix-mermaid-import' into 'master'
...
Fixed import of render mermaid & render math methods
See merge request gitlab-org/gitlab-ce!15550
2017-11-23 15:47:17 +00:00
453b178093
Fix pulling and pushing using a personal access token with the sudo scope
2017-11-23 16:32:08 +01:00
dbf97574dc
Merge branch '39887-move-identical-check-to-merged-branches' into 'master'
...
Move identical merged branch check to merged_branch_names
Closes #39887
See merge request gitlab-org/gitlab-ce!15464
2017-11-23 15:16:37 +00:00
ad70fb7bdc
Merge branch 'use-merge-requests-diff-id-column' into 'master'
...
Use foreign key to get latest MR diff
Closes #37631
See merge request gitlab-org/gitlab-ce!15126
2017-11-23 15:01:30 +00:00
038f5a412d
Merge branch 'jk-group-mentions-fix' into 'master'
...
Fix link text from group context
Closes gitlab-ee#4100
See merge request gitlab-org/gitlab-ce!15565
2017-11-23 14:04:42 +00:00
392cc88709
Add new API endpoint - get a namespace by ID
2017-11-23 14:34:34 +01:00
257fd57134
Allow password authentication to be disabled entirely
2017-11-23 13:16:14 +00:00
991bf24ec8
Use latest_merge_request_diff association
...
Compared to the merge_request_diff association:
1. It's simpler to query. The query uses a foreign key to the
merge_request_diffs table, so no ordering is necessary.
2. It's faster for preloading. The merge_request_diff association has to load
every diff for the MRs in the set, then discard all but the most recent for
each. This association means that Rails can just query for N diffs from N
MRs.
3. It's more complicated to update. This is a bidirectional foreign key, so we
need to update two tables when adding a diff record. This also means we need
to handle this as a special case when importing a GitLab project.
There is some juggling with this association in the merge request model:
* `MergeRequest#latest_merge_request_diff` is _always_ the latest diff.
* `MergeRequest#merge_request_diff` reuses
`MergeRequest#latest_merge_request_diff` unless:
* Arguments are passed. These are typically to force-reload the association.
* It doesn't exist. That means we might be trying to implicitly create a
diff. This only seems to happen in specs.
* The association is already loaded. This is important for the reasons
explained in the comment, which I'll reiterate here: if we a) load a
non-latest diff, then b) get its `merge_request`, then c) get that MR's
`merge_request_diff`, we should get the diff we loaded in c), even though
that's not the latest diff.
Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases,
but not quite all.
2017-11-23 12:14:56 +00:00
4563156256
Improve environments performance
2017-11-23 12:04:03 +00:00
e826c5d091
Fix link text from group context
2017-11-23 12:59:14 +01:00
4cfcc97544
Fix encoding bugs in Gitlab::Git::User
2017-11-23 10:48:57 +00:00
ffa2a98034
Merge branch 'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip' into 'master'
...
Avoid deactivation when pipeline schedules execute a branch includes `[ci skip]` comment
Closes #37991
See merge request gitlab-org/gitlab-ce!15405
2017-11-23 10:39:52 +00:00
5951320075
Make sure repository is restored
2017-11-23 18:26:41 +08:00
7df1cb528e
Move identical merged branch check to merged_branch_names
2017-11-23 18:26:41 +08:00
880c9a2c78
Backport fix epic fullscreen
2017-11-22 17:20:23 -06:00
50a5d638e5
Merge branch '32620-speed-up-unicorn-specs' into 'master'
...
Speed up Unicorn specs by using a dummy Rack application instead of GitLab
Closes #32620
See merge request gitlab-org/gitlab-ce!15548
2017-11-22 21:28:13 +00:00
f553405901
Merge branch '28377-add-edit-button-to-mobile-file-view' into 'master'
...
Add edit button to mobile file view
Closes #28377
See merge request gitlab-org/gitlab-ce!15199
2017-11-22 20:31:53 +00:00
11d0787961
Speed up Unicorn specs by using a dummy Rack application instead of GitLab
2017-11-22 19:51:57 +00:00
Phil Hughes
Kamil Trzciński
Douwe Maan
Tomasz Maczukin
Fatih Acet
Rémy Coutable
George Andrinopoulos
digitalMoksha
Sean McGivern
Douwe Maan
James Edwards-Jones
Filipa Lacerda
Pawel Chojnacki
Felipe Artur
James Lopez
Markus Koller
Sean McGivern
Jarka Kadlecova
Jacob Vosmaer (GitLab)
Lin Jen-Shin
Clement Ho
Nick Thomas