Mayra Cabrera
3327bf6247
Removes 'no job log' from trace action
...
'No job log' message is no longer necessary since we returned an image
when a build does not have a trace. See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more
details
Closes #45625
2018-04-22 10:55:17 -05:00
Andreas Brandl
9ea2fc85a3
Atomic internal ids for all models
2018-04-20 14:00:15 +00:00
Douwe Maan
6d2c7cbead
Merge branch 'rd-45502-uploading-project-export-with-lfs-file-locks-fails' into 'master'
...
Don't include lfs_file_locks data in export bundle
Closes #45502
See merge request gitlab-org/gitlab-ce!18495
2018-04-20 09:40:22 +00:00
Douwe Maan
7053bdba2e
Merge branch '39345-get-raw-archive' into 'master'
...
Add an API endpoint to download git repository snapshots
Closes #39345
See merge request gitlab-org/gitlab-ce!18173
2018-04-20 09:26:34 +00:00
Sean McGivern
0b9824e7d2
Merge branch '42803-show-new-branch-mr-button' into 'master'
...
Resolve "Show new branch/merge request button even if a branch / merge request already exists"
Closes #42803
See merge request gitlab-org/gitlab-ce!17712
2018-04-20 09:09:40 +00:00
James Lopez
225994f005
Update CHANGELOG.md for 10.7.0
...
[ci skip]
2018-04-20 10:55:29 +02:00
Rubén Dávila
2d7efd9637
Don't include lfs_file_locks data in export bundle
2018-04-19 23:30:32 -05:00
Jose
9451a82f5c
Refactored activity calendar
2018-04-19 11:34:46 -05:00
Nick Thomas
672733aa66
Add an API endpoint to download git repository snapshots
2018-04-19 17:25:01 +01:00
Francisco Javier López
92deabb34a
Respect visibility options and description when importing project from template
2018-04-19 15:24:32 +00:00
Dennis Tang
49b85262c5
Resolve "Improve tooltips of collapsed sidebars"
2018-04-19 14:43:20 +00:00
Yorick Peterse
ddbc6d85e4
Merge branch '45476-geo-statement-timeout-counting-local-job-artifacts' into 'master'
...
Resolve "Geo: Statement timeout counting local job artifacts"
Closes #45476
See merge request gitlab-org/gitlab-ce!18444
2018-04-19 14:12:42 +00:00
Douwe Maan
82fb02fff6
Merge branch '45507-fix-repository-archive-url' into 'master'
...
Fix specifying a non-default ref when requesting an archive using the legacy URL
Closes #45507
See merge request gitlab-org/gitlab-ce!18468
2018-04-19 14:00:32 +00:00
Yorick Peterse
a313aeceee
Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'
...
Fix N+1 queries when loading participants for a commit note
Closes #45526
See merge request gitlab-org/gitlab-ce!18471
2018-04-19 12:51:51 +00:00
Jacopo
5a29a304be
Shows new branch/mr button even when branch exists
2018-04-19 13:56:36 +02:00
Nick Thomas
276d4eb80c
Fix specifying a non-default ref when requesting an archive using the legacy URL
2018-04-19 12:47:23 +01:00
Kamil Trzciński
a28f25b565
Fix direct_upload when records with null file_store are used
...
Old records have a null value of file_store column.
This causes the problems with current direct_upload implementation,
as this makes it to choose Store::REMOTE instead of Store::LOCAL.
This change moves the store save when change saving the object.
2018-04-19 12:09:51 +02:00
Grzegorz Bizon
00167a2b1a
Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'
...
Resolve "Calculating total size of a project's CI artifacts"
Closes #41059
See merge request gitlab-org/gitlab-ce!17839
2018-04-19 09:19:40 +00:00
Dylan Griffith
03b020f2e4
Update ProjectStatistics#build_artifacts_size synchronously without summing ( #41059 )
...
Previously we scheduled a worker to just some this but we were running
into performance issues when the build table was getting too large. So
now we've updated the code such that this column is updated immediately
and incremented/decremented by the correct amount whenever artifacts are
created or deleted.
We've also added the performance optimization that we do not update this
statistic if a project is deleted because it could result in many
updates for a project with many builds.
2018-04-19 18:35:40 +10:00
Jan Provaznik
470b3cb5a1
Fix label links update on project transfer
2018-04-19 08:17:12 +00:00
André Luís
71102f0280
Resolve "Get rid of branch element all in bottom bar in WEB IDE"
2018-04-19 07:44:24 +00:00
Stan Hu
775211bc70
Fix N+1 queries when loading participants for a commit note
...
We saw about 10,000 SQL queries for some commits in the NewNoteWorker,
which stalled the Sidekiq queue for other new notes. The notification
service took up to 8 minutes to process the commits. Avoiding this
N+1 query brings the time down significantly.
Closes #45526
2018-04-18 22:04:22 -07:00
Ash McKenzie
0ac5f1279e
Add index to file_store on ci_job_artifacts
2018-04-19 10:28:51 +10:00
André Luís
c352f695d7
Resolve "View labels when editing labels in sidebar and board sidebar"
2018-04-18 22:29:58 +00:00
Robert Speicher
aa2bb20756
Merge branch 'revert-goldiloader' into 'master'
...
Revert the addition of goldiloader
See merge request gitlab-org/gitlab-ce!18458
2018-04-18 19:02:04 +00:00
Rémy Coutable
a3bbd03918
Merge branch 'bvl-shared-groups-on-group-page' into 'master'
...
Fix issues on groups group trees
Closes #42407
See merge request gitlab-org/gitlab-ce!18390
2018-04-18 17:52:37 +00:00
Francisco Javier López
e8a27a67fa
Fix Custom hooks are not triggered by UI wiki edit
2018-04-18 17:50:56 +00:00
Bob Van Landuyt
2a9a2b22e6
Revert "Don't include projects shared as group-descendants"
...
This reverts commit 2c3c5b3554
.
Revisit this after https://gitlab.com/gitlab-org/gitlab-ce/issues/45441
2018-04-18 17:15:52 +02:00
Bob Van Landuyt
1b0156204d
Recover from errors when a parent is not preloaded
2018-04-18 17:15:51 +02:00
Yorick Peterse
1a2728d940
Removed goldiloader changelog file
2018-04-18 15:57:04 +02:00
Enrico Scholz
f46fba2b0b
changelog: added entry
...
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
2018-04-18 11:50:48 +02:00
Douwe Maan
f150f262a9
Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"
...
This reverts merge request !18399
2018-04-18 09:41:49 +00:00
Douwe Maan
84eeb9468c
Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'
...
Email notification on issue due date
Closes #27500
See merge request gitlab-org/gitlab-ce!17985
2018-04-18 09:33:44 +00:00
🙈 jacopo beschi 🙉
c6b1043e9d
Resolve "Make a Rubocop that forbids returning from a block"
2018-04-18 09:19:40 +00:00
Sean McGivern
5db76a3b2e
Merge branch '40402-time-estimate-system-notes-can-be-confusing' into 'master'
...
Resolve "Time estimate system notes can be confusing"
Closes #40402
See merge request gitlab-org/gitlab-ce!18326
2018-04-18 08:40:41 +00:00
Kamil Trzciński (OoO till 16th of April)
df0a457d6f
Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'
...
Fix `Trace::HttpIO` can not render multi-byte chars
Closes #44981
See merge request gitlab-org/gitlab-ce!18417
2018-04-18 08:25:53 +00:00
Kamil Trzciński (OoO till 16th of April)
55ce9d2448
Merge branch 'improve-jobs-queuing-time-metric' into 'master'
...
Improve jobs queuing time metric (fixed version)
Closes #45205
See merge request gitlab-org/gitlab-ce!18283
2018-04-18 08:24:19 +00:00
Tim Zallmann
9a5765bfde
Merge branch 'fix-size-and-position-for-fork-icon' into 'master'
...
Fix size and position for fork icon
Closes #42582
See merge request gitlab-org/gitlab-ce!18399
2018-04-18 07:14:11 +00:00
Clement Ho
adcdb25b01
Merge branch '42543-hide-divergence-graph-on-branches-for-mobile' into 'master'
...
Remove ahead/behind graphs on project branches on mobile
Closes #42543
See merge request gitlab-org/gitlab-ce!18415
2018-04-17 22:06:03 +00:00
George Tsiolis
5a34d3bd16
Fix size and position for fork icon
2018-04-18 00:05:50 +03:00
Nick Thomas
b3ed751c0e
Merge branch 'zj-ref-exists-opt-out' into 'master'
...
Move Gitaly RefExists check to OPT_OUT
Closes gitaly#401
See merge request gitlab-org/gitlab-ce!18333
2018-04-17 17:37:08 +00:00
Tim Zallmann
4355a13ad4
Merge branch '21677-run-pipeline-word' into 'master'
...
Resolve "Improve wording / copy for running a pipeline"
Closes #21677
See merge request gitlab-org/gitlab-ce!18396
2018-04-17 15:36:02 +00:00
Phil Hughes
606ed05edf
Merge branch '45271-collpased-diff-loading' into 'master'
...
Resolve "Collapsed diff spacing wrong when failed to load"
Closes #45271 and #45317
See merge request gitlab-org/gitlab-ce!18351
2018-04-17 15:22:44 +00:00
Filipa Lacerda
1a420fd25f
Merge branch 'ide-tree-loading-fix' into 'master'
...
Fixed loading state not showing in IDE tree list
See merge request gitlab-org/gitlab-ce!18421
2018-04-17 15:20:12 +00:00
Nick Thomas
f13d5da2ae
Merge branch '45363-optional-params-on-api-endpoint-produce-invalid-pagination-header-links' into 'master'
...
Fix URLs in the `Link` header for `GET /projects/:id/repository/contributors` when no value is passed for `order_by` or `sort`
Closes #45363
See merge request gitlab-org/gitlab-ce!18393
2018-04-17 14:51:06 +00:00
Stan Hu
73431ad0d1
Merge branch 'fix/gb/fix-empty-secret-variables' into 'master'
...
Fix a case with empty secret CI/CD variables
Closes #31929
See merge request gitlab-org/gitlab-ce!18400
2018-04-17 13:33:14 +00:00
Rémy Coutable
422aa5a62d
[API] Fix URLs in the 'Link' header for 'GET /projects/:id/repository/contributors' when no value is passed for 'order_by' or 'sort'
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-17 15:20:07 +02:00
Paul
c34268c8de
Fix the input confirmation validation for the delete branches modal
2018-04-17 13:11:19 +00:00
Taurie Davis
a442e34cde
Replace 'GKE' with 'Google Kubernetes Engine'
2018-04-17 12:59:31 +00:00
Sean McGivern
e86923ebac
Merge branch '45436-markdown-is-not-rendering-error-loading-viewer-undefined-method-html_escape' into 'master'
...
Resolve "Markdown is not rendering, "Error loading viewer": undefined method `html_escape'"
Closes #45436
See merge request gitlab-org/gitlab-ce!18418
2018-04-17 12:53:01 +00:00