Commit Graph

1179 Commits

Author SHA1 Message Date
Francisco Javier López ade320d2db Fix bug with Wiki pages encoding 2018-07-31 06:08:19 +00:00
Douwe Maan 5f84509c05 Merge branch 'stop-dynamic-routable-creation' into 'master'
Stop building Route rows on the fly

See merge request gitlab-org/gitlab-ce!20313
2018-07-27 13:51:04 +00:00
Felipe Artur 13ea4b387d Merge remote-tracking branch 'dev/master' 2018-07-26 18:30:50 -03:00
Felipe Artur Cardozo 45c94aba1b Merge branch '48617-promoting-milestone' into 'master'
[master] Escapes milestone title shown in flash message when promoting a milestone

See merge request gitlab/gitlabhq!2436
2018-07-26 21:16:34 +00:00
Douwe Maan 13b97d3f94 Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master'
Resolve "Define /commits/ behaviour"

Closes #31576

See merge request gitlab-org/gitlab-ce!20738
2018-07-26 07:55:02 +00:00
Yorick Peterse 7a233b37cd
Remove code for dynamically generating routes
This adds a database migration that creates routes for any projects and
namespaces that don't already have one. We also remove the runtime code
for dynamically creating routes, as this is no longer necessary.
2018-07-25 16:41:29 +02:00
Stan Hu c8ff6b7c73 Use limit parameter to retrieve Wikis from Gitaly
Without this parameter, every load of a Wiki page will load all the Wiki pages
in the repository for the sidebar. This is a significant performance penalty
that can significant slow the display of all Wiki pages.

Relates to #40101
2018-07-24 15:36:31 -07:00
Kia Mei Somabes 1dbf32d84b Remove before hook for spec 2018-07-25 06:30:16 +08:00
Kia Mei Somabes c03bc268be Transfer to commits_controller, add test, and update changelog 2018-07-24 08:04:16 +08:00
Oswaldo Ferreira 3ecc2b04a3 Render MR page when no persisted diff_refs or diffs size 2018-07-18 10:53:19 +01:00
Filipa Lacerda a0930b83ec Escapes milestone and label names when promoting them 2018-07-17 10:21:12 +01:00
Filipa Lacerda fc9f90045d
Escapes milestone title shown in flash message when promoting a milestone 2018-07-13 15:00:14 +01:00
Jarka Kadlecová 8717c7dad9 Revert "Merge branch 'ee-5481-epic-todos' into 'master'"
This reverts commit 4d9a3f42f1, reversing
changes made to ecf9c145f6.
2018-07-11 18:33:24 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Grzegorz Bizon c7b8afcd90 Merge branch 'improve-metadata-access-performance' into 'master'
Improve metadata access performance

See merge request gitlab-org/gitlab-ce!20493
2018-07-10 09:21:11 +00:00
Kamil Trzciński 737666a3d1 Fix specs 2018-07-09 18:13:34 +02:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
Kamil Trzciński 5a9f23e780 Fix and add specs for testing metadata entry 2018-07-09 14:19:52 +02:00
Kamil Trzciński bc00803af0 Access metadata directly from Object Storage
Previously we would pull the file, now, we just stream-it as needed from Object Storage
2018-07-09 14:19:52 +02:00
Sean McGivern 8488a39cbc Merge branch 'port-c32af9da-to-ce' into 'master'
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb

See merge request gitlab-org/gitlab-ce!20407
2018-07-05 15:01:25 +00:00
Francisco Javier López a7a1531fe5 Web Terminal Ci Build 2018-07-05 13:55:10 +00:00
Rémy Coutable b7b3a059f9
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-07-05 13:28:46 +02:00
Filipa Lacerda 116955c453 Merge branch '45739-add-metrics-to-operations-tab' into 'master'
Resolve "Add Metrics to Operations Tab"

Closes #45739

See merge request gitlab-org/gitlab-ce!20025
2018-07-04 17:10:37 +00:00
Kamil Trzciński (OoO till 3th) 170a15514a Merge branch '43446-new-cluster-page-tabs' into 'master'
Resolve "Change new cluster page design to use tabs"

Closes #43446 and #46304

See merge request gitlab-org/gitlab-ce!18963
2018-07-04 14:51:38 +00:00
Sean McGivern 4d9a3f42f1 Merge branch 'ee-5481-epic-todos' into 'master'
Port of Todos for epics

See merge request gitlab-org/gitlab-ce!19908
2018-07-04 12:57:37 +00:00
Kamil Trzciński (OoO till 3th) 34694c3afc Merge branch 'jprovazn-direct-upload' into 'master'
Add workhorse authorize method for project/group uploads

Closes #44663

See merge request gitlab-org/gitlab-ce!19717
2018-07-04 09:50:29 +00:00
Douwe Maan 03f0f2566b Merge branch 'bvl-graphql-pipeline-lists' into 'master'
Add pipeline lists to graphql

Closes #48469

See merge request gitlab-org/gitlab-ce!20249
2018-07-04 09:31:07 +00:00
Kamil Trzciński (OoO till 3th) 391710f29d Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'
Resolve "Inconsistent job list in job details view"

Closes #47040

See merge request gitlab-org/gitlab-ce!20243
2018-07-04 09:17:42 +00:00
Bob Van Landuyt 04b046587f Add pipeline lists to GraphQL
This adds Keyset pagination to GraphQL lists. PoC for that is
pipelines on merge requests and projects.

When paginating a list, the base-64 encoded id of the ordering
field (in most cases the primary key) can be passed in the `before` or
`after` GraphQL argument.
2018-07-04 10:53:39 +02:00
Jan Provaznik 7458ca8ebb [backend] Addressed review comments
* Group filtering now includes also issues/MRs from
subgroups/subprojects
* fixed due_date
* Also DRYed todo controller specs
2018-07-03 09:34:44 +02:00
Tiago Botelho 55e2df6c80 Fixes backend specs 2018-07-02 13:02:06 +01:00
Matija Čupić c8e20d6f8f
Check for correct builds collection 2018-06-29 18:07:09 +02:00
Tiago Botelho c9a7145a10 Remove GET empty from EnvironmentsController 2018-06-29 10:02:32 +02:00
Tiago Botelho dd467d6c75 Prevents project first environment from being fetched in every project view 2018-06-28 14:25:15 +02:00
Tiago Botelho 91463e5246 Specify environment actions to distinguish between metrics and every other environment related actions 2018-06-26 23:06:25 -05:00
Constance Okoghenun 7d310e0f11 Updated test for promoted milestones success message 2018-06-21 22:14:46 +01:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Dennis Tang 0e7f8fd5bd Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs 2018-06-21 08:48:25 +00:00
Rémy Coutable a88a9e22c5 Merge branch 'rails5-fix-48104' into 'master'
Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times

Closes #48104

See merge request gitlab-org/gitlab-ce!20004
2018-06-20 10:00:32 +00:00
Jasper Maes 74bb2e728b Rails5 fix Projects::PagesController spec 2018-06-19 22:58:46 +02:00
Jasper Maes 9214e273a8 Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times 2018-06-19 19:53:51 +02:00
Dennis Tang dc31dac219 Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs 2018-06-19 15:27:39 +00:00
Dennis Tang ce0ce1cb19 consolidate back into one controller 2018-06-19 15:01:43 +00:00
Rémy Coutable 52f53c2e0b Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into 'master'
[Rails5] Fix pipeline_schedules_controller_spec

Closes #48011

See merge request gitlab-org/gitlab-ce!19919
2018-06-18 09:18:32 +00:00
Rémy Coutable 99fdbe4c23 Merge branch 'rails5-fix-47960' into 'master'
Rails5 fix update_attribute usage not causing a save

Closes #47960

See merge request gitlab-org/gitlab-ce!19881
2018-06-18 08:58:23 +00:00
Douwe Maan 4be23eeae3 Merge branch '47933-MR-invisible-milestone' into 'master'
Resolve "Milestone not updating in MR sidebar after selection"

Closes #47933

See merge request gitlab-org/gitlab-ce!19870
2018-06-18 08:29:41 +00:00
Jan Provaznik 656d4ebf67 Add workhorse authorize method for project/group uploads
This method can be used by workhorse to get presigned
URLs used for direct upload of files.
2018-06-18 09:11:02 +02:00
blackst0ne 2b1153f71a [Rails5] Fix pipeline_schedules_controller_spec
In Rails 5.0 there's a bug [1] in controller tests that doesn't parse
nested parameters correctly.

This commit brings a workaround to make specs work again both in rails4
and rails5.

[1]: https://github.com/rails/rails/issues/23997
2018-06-16 15:26:15 +11:00
Mario de la Ossa c6420ce2ab
Fix milestones disappearing when changed on MR 2018-06-15 17:46:49 -06:00
Douwe Maan fbc749a96e Reuse viewer param and move logic to blob controller 2018-06-15 09:42:56 +00:00