Commits · 39ca951a0f28d147d4689379bbe48a9c14d55d9f · nexedi / gitlab-ce

08 Aug, 2017 2 commits
- Add migrations to store Namespace's plan as Integer instead of String · 39ca951a
  Rubén Dávila authored Aug 08, 2017
  
  39ca951a
- Merge branch '31207-clean-locked-merge-requests-ee' into 'master' · 3896e942
  Stan Hu authored Aug 08, 2017
```
[EE] Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"

See merge request !2621
```
  3896e942
07 Aug, 2017 38 commits
- Merge branch 'ee-33874_confi' into 'master' · 878e0674
  Jacob Schatz authored Aug 07, 2017
```
EE patch branch for compact check for 33874_confi

See merge request !2618
```
  878e0674
- EE patch branch for compact check for 33874_confi · ab8d9f0c
  Regis Boudinot authored Aug 07, 2017
  
  ab8d9f0c
- Exclude merge_jid on Import/Export attribute configuration · dddee45f
  Oswaldo Ferreira authored Aug 07, 2017
  
  dddee45f
- Merge branch 'bvl-circuitbreaker-port' into 'master' · 72e0ee3f
  Sean McGivern authored Aug 07, 2017
```
EE-Port: Circuitbreaker for storage paths

Closes gitlab-com/infrastructure#1946

See merge request !2617
```
  72e0ee3f
- Re-add column locked_at on migration rollback · edf60713
  Oswaldo Ferreira authored Aug 07, 2017
  
  edf60713
- Merge branch '98-pull-mirror-ssh-keys-2' into 'master' · 7559ccc7
  Tim Zallmann authored Aug 07, 2017
```
Resolve "Pull repository mirroring: Support for SSH keys"

Closes #98

See merge request !2551
```
  7559ccc7
- Merge branch 'feature/audit-events-failed-login-2' into 'master' · 5fa10409
  Sean McGivern authored Aug 07, 2017
```
Refactor omniauth controller code

See merge request !2619
```
  5fa10409
- Merge branch 'ee-35761-convdev-perc' into 'master' · d262f2b5
  Sean McGivern authored Aug 07, 2017
```
EE Port of: Store & use ConvDev percentages returned by Version app

See merge request !2614
```
  d262f2b5
- Move locked_at removal to post-deployment migration · 22d5be98
  Oswaldo Ferreira authored Aug 07, 2017
  
  22d5be98
- Store MergeWorker JID on merge request, and clean up stuck merges · df53c2a1
  Oswaldo Ferreira authored Jul 31, 2017
  
  df53c2a1
- Merge branch 'group-milestone-references-system-notes' into 'master' · 79da4210
  Robert Speicher authored Aug 07, 2017
```
[EE] Support group milestone references

See merge request !2612
```
  79da4210
- Stub storage configuration using a helper · 8eed7851
  Bob Van Landuyt authored Aug 07, 2017
  
  8eed7851
- Add a helper to stub storage settings with defaults · d7fa3443
  Bob Van Landuyt authored Aug 07, 2017
  
  d7fa3443
- Merge branch 'perf.auditor-query' into 'master' · 063c9755
  Sean McGivern authored Aug 07, 2017
```
reverse the conditions in `auditor?`

See merge request !2620
```
  063c9755
- Circuitbreaker for storage paths · bab79155
  Sean McGivern authored Aug 07, 2017
```
Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775

See merge request !11449
```
  bab79155
- Merge branch 'ee-15664-remove-jquery-nicescroll' into 'master' · 7efded3a
  Phil Hughes authored Aug 07, 2017
```
EE Port of Resolve "Remove jQuery Nicescroll"

See merge request !2608
```
  7efded3a
- Fix a haml_lint whitespace error · 6b867eb8
  Nick Thomas authored Aug 07, 2017
  
  6b867eb8
- refactor omniauth callbacks controller · ad89850e
  James Lopez authored Aug 07, 2017
  
  ad89850e
- Store & use ConvDev percentages returned by Version app · d0edfe39
  Jarka Kadlecova authored Aug 01, 2017
  
  d0edfe39
- Merge branch 'feature/audit-events-failed-login' into 'master' · 1adb89c1
  Sean McGivern authored Aug 07, 2017
```
Audit failed login events

See merge request !2587
```
  1adb89c1
- Audit failed login events · e74c7e2a
  James Lopez authored Aug 07, 2017
  
  e74c7e2a
- Merge branch '36052-reset-only-migration-models-ee' into 'master' · 258792a0
  Sean McGivern authored Aug 07, 2017
```
Reset only migration models

See merge request !2611
```
  258792a0
- DRY up caching in AbstractReferenceFilter · 22f48613
  Sean McGivern authored Aug 07, 2017
```
We had a lot of copied and pasted code, when the different elements were very
small and easy to get wrong.
```
  22f48613
- Frontend for configuring pull mirroring with SSH authentication · fd467491
  kushalpandya authored Jul 19, 2017
  
  fd467491
- Documentation for SSH pull mirrors · f885f8cb
  Nick Thomas authored Aug 02, 2017
  
  f885f8cb
- Allow pull mirrors to use SSH public key authentication (backend) · 3750f160
  Nick Thomas authored Aug 07, 2017
  
  3750f160
- Backend for looking up SSH host keys · e5c906ba
  Nick Thomas authored Jul 19, 2017
  
  e5c906ba
- reverse the conditions in `auditor?` · 3d3d5c1c
  http://jneen.net/ authored Aug 07, 2017
  
  3d3d5c1c
- Merge branch 'ee-34028-collapse-sidebar' into 'master' · a58edda3
  Phil Hughes authored Aug 07, 2017
```
Make contextual sidebar collapsible

See merge request !2616
```
  a58edda3
- Merge branch '2224-selective-replication' into 'master' · f1c14522
  Robert Speicher authored Aug 07, 2017
```
Geo - Selectively choose which projects to replicate in DR

Closes #2224

See merge request !2533
```
  f1c14522
- Add changelog · bb6185ab
  Annabel Dunstone Gray authored Aug 07, 2017
  
  bb6185ab
- Merge branch 'zj-job-user-ci-token-auth' into 'master' · 8e9676b1
  Sean McGivern authored Aug 07, 2017
```
Allow API access with CI_JOB_TOKEN

Closes #2770

See merge request !2346
```
  8e9676b1
- Make contextual sidebar collapsible · 5b19c4e4
  Annabel Dunstone Gray authored Aug 02, 2017
  
  5b19c4e4
- Fix spec for Gitlab::Geo::LogCursor::Daemon · 266a8421
  Douglas Barbosa Alexandre authored Aug 04, 2017
  
  266a8421
- Rename GeoNode#project_ids to restricted_project_ids · 8294f211
  Douglas Barbosa Alexandre authored Aug 03, 2017
  
  8294f211
- Improve spec for Geo::RepositoriesCleanUpWorker · 88a21685
  Douglas Barbosa Alexandre authored Aug 03, 2017
  
  88a21685
- Improve spec for Geo::FileDownloadDispatchWorker · aa06b60e
  Douglas Barbosa Alexandre authored Aug 03, 2017
  
  aa06b60e
- Improve spec for Geo::RepositorySyncWorker · ab4a98ed
  Douglas Barbosa Alexandre authored Aug 03, 2017
  
  ab4a98ed