e1ad8ca6d0
Test trace_spec on both conditions - ci_enable_live_trace is on/off
2018-05-04 19:49:26 +09:00
30464bceaa
Merge branch 'master' into live-trace-v2
2018-05-03 14:21:06 +09:00
8b0b4ecee2
Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'
...
Migrate pipeline stages indices
Closes #43009
See merge request gitlab-org/gitlab-ce!18420
2018-05-02 07:28:15 +00:00
65c11f3261
Merge branch 'master' into live-trace-v2
2018-05-02 14:23:47 +09:00
1134f540d2
Merge branch 'helm-add-alpine-mirrors' into 'master'
...
Add alpine mirrors while operating on k8s cluster
Closes gitlab-ee#4922
See merge request gitlab-org/gitlab-ce!18651
2018-05-01 13:08:59 +00:00
0fd0b64be6
Use stages position column to track stage index
2018-05-01 14:30:44 +02:00
b337a086d5
Merge branch 'master' into backstage/gb/migrate-pipeline-stages-index
...
* master: (106 commits)
2018-05-01 14:24:39 +02:00
54695563ca
Merge branch 'master' into live-trace-v2
2018-05-01 14:13:12 +09:00
9cf4e47341
Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'
...
Serve archive requests with the correct file in all cases (10.7)
See merge request gitlab/gitlabhq!2376
2018-04-30 15:00:14 -05:00
ce5723c849
Add alpine mirrors while operating on k8s cluster
2018-04-30 15:12:26 +02:00
0d99298aa3
Merge branch 'master' into live-trace-v2
2018-04-30 14:14:20 +09:00
0a4e57f3d7
Merge branch 'master' into live-trace-v2
2018-04-27 23:11:15 +09:00
7da1b4cbf1
Add gitlab-pages admin ping rake task
2018-04-27 11:01:54 +00:00
6b2eb865ca
Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'
...
Improve pipeline creation service performance
Closes #37987
See merge request gitlab-org/gitlab-ce!18582
2018-04-26 08:35:19 +00:00
9d6fe7bfdf
Refactoring ci_job_trace to ci_build_trace
2018-04-26 15:06:04 +09:00
4eb67ccff3
Merge branch 'master' into live-trace-v2
2018-04-26 14:23:36 +09:00
6587d3680e
Merge branch 'zj-storage-path-deprecation' into 'master'
...
Legacy disk path refactor
Closes gitaly#1111
See merge request gitlab-org/gitlab-ce!18364
2018-04-25 13:55:21 +00:00
37b9a441c1
Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'
...
# Conflicts:
# db/schema.rb
2018-04-25 13:40:13 +00:00
ec4423665c
Gitlab::Shell works on shard name, not path
...
Direct disk access is done through Gitaly now, so the legacy path was
deprecated. This path was used in Gitlab::Shell however. This required
the refactoring in this commit.
Added is the removal of direct path access on the project model, as that
lookup wasn't needed anymore is most cases.
Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
2018-04-25 13:36:22 +02:00
e4d6984465
Do not save associated records for pipeline builds twice
2018-04-25 13:35:40 +02:00
906fc00c33
Merge branch 'bvl-fix-maintainer-push-error' into 'master'
...
Fix errors on pushing/editing files on empty repositories
Closes #44618 and #42583
See merge request gitlab-org/gitlab-ce!18462
2018-04-24 14:49:38 +00:00
c9dc51111d
Rename stage index column name to priority column
2018-04-24 15:48:10 +02:00
35a49922e6
Allow admins to push to empty repos
2018-04-24 14:06:59 +02:00
f5524d554b
Merge branch '10244-add-project-ci-cd-settings' into 'master'
...
Introduce new ProjectCiCdSettings model with group_runners_enabled
See merge request gitlab-org/gitlab-ce!18144
2018-04-24 11:05:20 +00:00
1e624f3401
Merge branch 'jej/refactor-omniauth-controller' into 'master'
...
Refactor OmniauthCallbacksController to remove duplication
Closes #26559
See merge request gitlab-org/gitlab-ce!16694
2018-04-24 10:18:10 +00:00
fc6ec8adab
Remove empty line from stages index migration specs
2018-04-24 11:07:37 +02:00
02999234d4
Add background migration that migrates stages indices
2018-04-24 11:07:37 +02:00
10df70146e
Add stage index to safe import/export attributes
2018-04-24 11:07:37 +02:00
cae3092f23
Fix specs creating a pipeline stage with implicit index
2018-04-24 11:07:37 +02:00
f0d59b95f1
Validate presence of a stage index in the model
2018-04-24 11:07:37 +02:00
fd8a63f71e
Merge branch 'master' into live-trace-v2
2018-04-24 14:10:57 +09:00
1b9c1ac3ad
Merge branch 'master' into 10244-add-project-ci-cd-settings
2018-04-24 15:07:34 +10:00
ab286656b2
Resolve "Namespace factory is problematic"
2018-04-23 15:48:26 +00:00
dd09a19ad6
Auth::User classes refactor adds should_save?
2018-04-23 16:24:56 +01:00
d3a8a07423
Unify Saml::IdentityLinker and OAuth::IdentityLinker
2018-04-23 13:53:32 +01:00
c921e686b8
Moved committer and spec. Added some extra code to run hooks or not depending on the options
2018-04-23 10:56:46 +00:00
8a7654a52b
Fix statis analysys
2018-04-23 15:20:55 +09:00
9b6a495208
Merge branch 'master' into live-trace-v2
2018-04-23 14:21:01 +09:00
f8d54913bb
Show error on failed OAuth account link
2018-04-22 23:50:56 +01:00
f10c999bca
Refactor OmniauthCallbacksController to remove duplication
...
Moves LDAP to its own controller with tests
Provides path forward for implementing GroupSaml
2018-04-22 23:50:55 +01:00
0a6b7caac8
Merge branch 'master' into live-trace-v2
2018-04-20 21:51:44 +09:00
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
2d7efd9637
Don't include lfs_file_locks data in export bundle
2018-04-19 23:30:32 -05:00
672733aa66
Add an API endpoint to download git repository snapshots
2018-04-19 17:25:01 +01:00
93780da67c
Resolve "Show `failure_reason` in jobs view content section"
2018-04-19 07:20:53 +00:00
e8a27a67fa
Fix Custom hooks are not triggered by UI wiki edit
2018-04-18 17:50:56 +00:00
c6b1043e9d
Resolve "Make a Rubocop that forbids returning from a block"
2018-04-18 09:19:40 +00:00
bcd89dcd1f
Merge branch 'sh-memoize-repository-empty' into 'master'
...
Memoize Git::Repository#has_visible_content?
See merge request gitlab-org/gitlab-ce!18383
2018-04-17 12:34:58 +00:00
5f7f5eda92
Method to track recoverable exceptions in sentry
...
This adds a method to track errors that can be recovered from in
sentry.
It is useful when debugging performance issues, or exceptions that are
hard to reproduce.
2018-04-17 11:39:23 +02:00
23634e4567
Merge branch 'master' into live-trace-v2
2018-04-17 12:07:56 +09:00
Shinya Maeda
Kamil Trzciński
Grzegorz Bizon
Douwe Maan
Alessio Caiazza
Jacob Vosmaer (GitLab)
Grzegorz Bizon
Zeger-Jan van de Weg
Bob Van Landuyt
Dylan Griffith
Lin Jen-Shin
James Edwards-Jones
Francisco Javier López
Rubén Dávila
Nick Thomas
Mayra Cabrera
🙈 jacopo beschi 🙉