Commits · 0a42967a7c3b2b56124dc0f6417d16485e9e32ce · nexedi / gitlab-ce

04 Aug, 2017 4 commits
- Add a spec plus small refactors · 0a42967a
  Rubén Dávila authored Aug 04, 2017
  
  0a42967a
- Fix trial banner padding · b5d36452
  kushalpandya authored Aug 04, 2017
  
  b5d36452
- Show EE trial license modal on page load if present · fb3d05ec
  kushalpandya authored Aug 04, 2017
  
  fb3d05ec
- Move script to main · 55d4f597
  kushalpandya authored Aug 04, 2017
  
  55d4f597
03 Aug, 2017 33 commits
- Merge branch 'master' into 2501-trial-and-license-purchases-inside-gitlab-ee · f2a30d69
  Rubén Dávila authored Aug 03, 2017
  
  f2a30d69
- Fix build for static-analysis · bd2e1297
  Rubén Dávila authored Aug 03, 2017
  
  bd2e1297
- Merge branch 'ee-34904-specific-async-script-loading-by-using-a-page-variable' into 'master' · 451943c0
  Phil Hughes authored Aug 03, 2017
```
Applying CE Patch for global deferred JS loading

See merge request !2569
```
  451943c0
- Merge branch '2893-exclude-sidekiq-queues-from-execution-in-sidekiq-cluster' into 'master' · d4c84653
  Sean McGivern authored Aug 03, 2017
```
Exclude sidekiq queues from execution in sidekiq-cluster

Closes #2893

See merge request !2571
```
  d4c84653
- Merge branch 'master' into 2501-trial-and-license-purchases-inside-gitlab-ee · 2eaf32ad
  Rubén Dávila authored Aug 03, 2017
```
Conflicts:
	spec/factories/licenses.rb
```
  2eaf32ad
- Make rubocop green again · 7912e157
  Oswaldo Ferreira authored Aug 03, 2017
  
  7912e157
- Applying CE Patch for global deferred JS loading · 987b7e0d
  Tim Zallmann authored Aug 01, 2017
  
  987b7e0d
- Merge branch 'ee-specific-inline-code-removal' into 'master' · 4afbcb28
  Tim Zallmann authored Aug 03, 2017
```
Removed EE specific inline JS

See merge request !2592
```
  4afbcb28
- Merge branch 'use-rspec-support-helper-ee' into 'master' · c3358140
  Rémy Coutable authored Aug 03, 2017
```
EE: Don't include EmailHelpers manually, pick with rspec

See merge request !2591
```
  c3358140
- Adjust tiny typos · 2ea38ba3
  Oswaldo Ferreira authored Aug 03, 2017
  
  2ea38ba3
- Merge branch 'docs/protected-branches-ees' into 'master' · 02ec4ae7
  Marcia Ramos authored Aug 03, 2017
```
Mention EES in protected branches feature

See merge request !2590
```
  02ec4ae7
- Add documentation for the new flag · 5a5ddbc4
  Oswaldo Ferreira authored Aug 03, 2017
  
  5a5ddbc4
- Merge branch 'ee-fix-oauth-checkboxes' into 'master' · fcb077ac
  Filipa Lacerda authored Aug 03, 2017
```
Port of fix-oauth-checkboxes to EE

See merge request !2588
```
  fcb077ac
- Add changelog · 552e128e
  Oswaldo Ferreira authored Aug 03, 2017
  
  552e128e
- Use --negate as a flag without arguments · dc81976d
  Oswaldo Ferreira authored Aug 03, 2017
  
  dc81976d
- Add styles for license key preview toggle functionality · 90b3da36
  kushalpandya authored Aug 03, 2017
  
  90b3da36
- Add license key preview toggle · 4b6bcc71
  kushalpandya authored Aug 03, 2017
  
  4b6bcc71
- Removed EE specific inline JS · 80b39e38
  Phil Hughes authored Aug 03, 2017
  
  80b39e38
- Merge branch 'fix-object-store-docs' into 'master' · dd178124
  Achilleas Pipinellis authored Aug 03, 2017
```
Fix docs for using object storage for storing artifacts

See merge request !2580
```
  dd178124
- Don't include EmailHelpers manually, pick with rspec · 2453449e
  Lin Jen-Shin authored Aug 03, 2017
```
`:mailer` is needed to pick it easily, while
`type: :mailer` is needed for picking it automatically for
tests located in spec/mailers/*_spec.rb

It's a bit complicated in spec/services/notification_service_spec.rb
but we'll leave it alone for now.
```
  2453449e
- Mention EES in protected branches feature · 4e336006
  Achilleas Pipinellis authored Aug 03, 2017
  
  4e336006
- Merge branch 'winh-project-page-dropdown-style-ee' into 'master' · aef62b69
  Annabel Dunstone Gray authored Aug 03, 2017
```
Make dropdown style on project page consistent

See merge request !2577
```
  aef62b69
- Make dropdown style on project page consistent · 40753c25
  Winnie Hellmann authored Aug 03, 2017
  
  40753c25
- Port of fix-oauth-checkboxes to EE · b5d9c906
  Phil Hughes authored Aug 03, 2017
  
  b5d9c906
- Merge branch 'ce-to-ee-2017-07-28' into 'master' · 29fe5d4d
  Rémy Coutable authored Aug 03, 2017
```
CE upstream - Friday

Closes gitaly#408, gitaly#411, and #1827

See merge request !2554
```
  29fe5d4d
- Remove :empty_project factory from spec/requests/api/merge_requests_spec.rb · 2ede81d2
  Nick Thomas authored Aug 03, 2017
  
  2ede81d2
- Merge branch 'ee-sidebar-fly-out-sub-nav' into 'master' · 51fe933c
  Filipa Lacerda authored Aug 03, 2017
```
EE port of sidebar-fly-out-sub-nav

See merge request !2576
```
  51fe933c
- Fix merge conflicts · d90f9c52
  Nick Thomas authored Aug 03, 2017
  
  d90f9c52
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · 811c0255
  Nick Thomas authored Aug 03, 2017
  
  811c0255
- Try to fix some EE protected branches specs · 745db030
  Nick Thomas authored Aug 03, 2017
  
  745db030
- Merge branch 'sh-add-cursor-update-logging' into 'master' · e09a5a90
  Rémy Coutable authored Aug 03, 2017
```
Add structured log messages to Geo LogCursor

See merge request !2574
```
  e09a5a90
- Merge branch 'rs-empty_project-default-ee' into 'master' · cf27ede3
  Rémy Coutable authored Aug 03, 2017
```
[EE] Empty project factory by default

See merge request !2585
```
  cf27ede3
- Remove EE-specific usages of `:empty_project` · f81df0d4
  Robert Speicher authored Aug 02, 2017
  
  f81df0d4
02 Aug, 2017 3 commits
- Change all `:empty_project` to `:project` · 17f36d4b
  Robert Speicher authored Aug 02, 2017
  
  17f36d4b
- Remove `:empty_project` factory, implement `:repository` trait · 037a62f3
  Robert Speicher authored Aug 02, 2017
  
  037a62f3
- Remove documentation about `:empty_project` since we're removing it · 89c73add
  Robert Speicher authored Aug 02, 2017
  
  89c73add