Commits · 84f3f2ddca74bb9ad1e3ba735dc04523a02a3804 · nexedi / gitlab-ce

25 Jul, 2018 1 commit
- Adds Frontend related changes to prometheus alerts · 84f3f2dd
  Tiago Botelho authored Jul 25, 2018
  
  84f3f2dd
24 Jul, 2018 1 commit
- Removes name reference from alert fired email subject and replaces it by the title attribute · 62da6ef6
  Tiago Botelho authored Jul 24, 2018
  
  62da6ef6
23 Jul, 2018 1 commit
- Fixes broken backend specs · 681f2ee5
  Tiago Botelho authored Jul 22, 2018
  
  681f2ee5
20 Jul, 2018 1 commit
- Handle update and destroy behaviour of metrics to cleanly erase the associated alerts · e4ba4ccf
  Tiago Botelho authored Jul 20, 2018
  
  e4ba4ccf
19 Jul, 2018 1 commit
- Adds the backend logic required to add Prometheus Alerts to Custom Metrics · 1caffa13
  Tiago Botelho authored Jul 19, 2018
  
  1caffa13
17 Jul, 2018 8 commits
- Merge branch 'rails5-fix-6605' into 'master' · d784bad9
  Yorick Peterse authored Jul 17, 2018
```
Rails5 fix NoMethodError: undefined method 'message' for nil:NilClass

Closes #6605

See merge request gitlab-org/gitlab-ee!6507
```
  d784bad9
- Merge branch 'ee-move-danger-to-test-stage' into 'master' · 1d5eecc7
  Sean McGivern authored Jul 17, 2018
```
[EE] Move Danger to test stage

Closes gitlab-ce#49185

See merge request gitlab-org/gitlab-ee!6531
```
  1d5eecc7
- Improve danger/specs/Dangerfile by not requiring new specs if specific labels are applied · d5dcf9ab
  Rémy Coutable authored Jul 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d5dcf9ab
- Improve danger/changelog/Dangerfile to include the title in the bin/changelog command · d4bf33dd
  Rémy Coutable authored Jul 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d4bf33dd
- [EE] Move the 'danger-review' job to the test stage and allow it to fail · 13483ea1
  Rémy Coutable authored Jul 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  13483ea1
- Merge branch 'ce-to-ee-2018-07-16' into 'master' · 2497cd1e
  Grzegorz Bizon authored Jul 17, 2018
```
CE upstream - 2018-07-16 15:23 UTC

See merge request gitlab-org/gitlab-ee!6524
```
  2497cd1e
- Resolve conflicts in a `locale/gitlab.pot` · 6ca4ecec
  Grzegorz Bizon authored Jul 17, 2018
  
  6ca4ecec
- Merge branch... · 654509d7
  Stan Hu authored Jul 17, 2018
```
Merge branch '6888-geo-project-imports-may-not-be-synced-if-repository-takes-some-time-to-fetch' into 'master'

Resync project repositories on secondaries nodes when import finishes

See merge request gitlab-org/gitlab-ee!6529
```
  654509d7
16 Jul, 2018 27 commits
- Add CHANGELOG · 250b71cc
  Douglas Barbosa Alexandre authored Jul 16, 2018
  
  250b71cc
- Resync project repositories on secondaries nodes when import finishes · e2177b63
  Douglas Barbosa Alexandre authored Jul 16, 2018
```
Project imports may not be synced if repository takes some time to
fetch. We also need to invalidate the checksum, otherwise we can
have stale checksums on the primary node.
```
  e2177b63
- Merge branch 'sh-fix-unknown-constant' into 'master' · 3fd62a46
  Rémy Coutable authored Jul 16, 2018
```
Fix undefined constant Gitlab::Git::HooksService::PreReceiveError

See merge request gitlab-org/gitlab-ee!6514
```
  3fd62a46
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-16 · 6770d6cd
  GitLab Bot authored Jul 16, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  6770d6cd
- Merge branch 'frozen-string-enable-app-services' into 'master' · 2c5e6b27
  Rémy Coutable authored Jul 16, 2018
```
Enable frozen string in apps/services/*.rb

See merge request gitlab-org/gitlab-ce!20401
```
  2c5e6b27
- Fix undefined constant Gitlab::Git::HooksService::PreReceiveError · d4787bf5
  Stan Hu authored Jul 15, 2018
```
Part of gitlab-org/gitlab-ce#49263
```
  d4787bf5
- Merge branch 'update-issue-closing-pattern' into 'master' · a73f4807
  Rémy Coutable authored Jul 16, 2018
```
Update issue closing pattern

Closes #49166

See merge request gitlab-org/gitlab-ce!20554
```
  a73f4807
- Merge branch 'ce-to-ee-2018-07-16' into 'master' · c975e29e
  Grzegorz Bizon authored Jul 16, 2018
```
CE upstream - 2018-07-16 12:22 UTC

See merge request gitlab-org/gitlab-ee!6522
```
  c975e29e
- Merge branch 'update-git-to-2-18-0' into 'master' · 9f524bbe
  Stan Hu authored Jul 16, 2018
```
Update Git version to 2.18.0

See merge request gitlab-org/gitlab-ce!20489
```
  9f524bbe
- Merge branch 'dz-fix-com-architecture-link' into 'master' · 95637923
  Rémy Coutable authored Jul 16, 2018
```
Fix invalid link to GitLab.com architecture.md

See merge request gitlab-org/gitlab-ce!20645
```
  95637923
- Merge branch 'tweak-sql-buckets' into 'master' · 1b151f35
  Yorick Peterse authored Jul 16, 2018
```
Add a 10 ms bucket for SQL timings

See merge request gitlab-org/gitlab-ce!20527
```
  1b151f35
- Merge branch 'i18n-extract-app/views/import' into 'master' · 00cf8773
  Rémy Coutable authored Jul 16, 2018
```
i18n: externalize strings from 'app/views/import'

See merge request gitlab-org/gitlab-ce!19732
```
  00cf8773
- Enable frozen string in apps/uploaders/*.rb · ddca49e4
  gfyoung authored Jul 05, 2018
```
Partially addresses #47424.
```
  ddca49e4
- Rails5 fix NoMethodError: undefined method 'message' for nil:NilClass · 4cd4740d
  Jasper Maes authored Jul 13, 2018
  
  4cd4740d
- Resolve conflicts in `locale/gitlab.pot` · 4eb46f10
  Grzegorz Bizon authored Jul 16, 2018
  
  4eb46f10
- Fix invalid link to GitLab.com architecture.md · 426a2d3a
  Dmitriy Zaporozhets authored Jul 16, 2018
  
  426a2d3a
- Resolve conflicts in mock_data.js · 0f36cbdf
  Grzegorz Bizon authored Jul 16, 2018
  
  0f36cbdf
- Resolve conflicts in environment_entity.rb · b8f653f9
  Grzegorz Bizon authored Jul 16, 2018
  
  b8f653f9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-16 · cd486031
  GitLab Bot authored Jul 16, 2018
```
# Conflicts:
#	app/serializers/environment_entity.rb
#	locale/gitlab.pot
#	spec/javascripts/environments/mock_data.js

[ci skip]
```
  cd486031
- i18n: externalize strings from 'app/views/import' · 72dc663c
  Tao Wang authored Jun 13, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
```
  72dc663c
- Merge branch 'patch-28' into 'master' · 05af3768
  Rémy Coutable authored Jul 16, 2018
```
Update 10.6-to-10.7.md

See merge request gitlab-org/gitlab-ce!20610
```
  05af3768
- Merge branch 'remove-repository-lookup' into 'master' · 690ff8b3
  Sean McGivern authored Jul 16, 2018
```
Remove Repository#lookup and unreachable rugged code

See merge request gitlab-org/gitlab-ce!20553
```
  690ff8b3
- Remove Repository#lookup and unreachable rugged code · 37eca765
  Jacob Vosmaer (GitLab) authored Jul 16, 2018
  
  37eca765
- Merge branch 'ee-remove-repository-lookup' into 'master' · 2190828c
  Sean McGivern authored Jul 16, 2018
```
Remove Repository#lookup and unreachable rugged code (EE version)

See merge request gitlab-org/gitlab-ee!6490
```
  2190828c
- Remove Repository#lookup and unreachable rugged code (EE version) · b8c9c646
  Jacob Vosmaer (GitLab) authored Jul 16, 2018
  
  b8c9c646
- Merge branch 'ce-to-ee-2018-07-16' into 'master' · cd8f4dd5
  Dmitriy Zaporozhets authored Jul 16, 2018
```
CE upstream - 2018-07-16 09:22 UTC

Closes charts/gitlab#586

See merge request gitlab-org/gitlab-ee!6519
```
  cd8f4dd5
- Merge branch... · 01ad732f
  Sean McGivern authored Jul 16, 2018
```
Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master'

Resolve "Project exports fail when uploads have been migrated to object storage"

Closes #48745

See merge request gitlab-org/gitlab-ce!20484
```
  01ad732f