Commits · 9c1c26d0f81a146b3f84284b4fb5437ec9c97739 · nexedi / gitlab-ce

04 Aug, 2017 3 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-03 · 9c1c26d0
  Nick Thomas authored Aug 04, 2017
  
  9c1c26d0
- Merge branch 'ee-diff-changed-files-dropdown' into 'master' · 6c1c5b19
  Filipa Lacerda authored Aug 04, 2017
```
EE port of diff-changed-files-dropdown

See merge request !2586
```
  6c1c5b19
- Merge branch 'fix-duplicate-links-in-project-sidebar' into 'master' · dece0ac0
  Filipa Lacerda authored Aug 04, 2017
```
Fixed a bad conflict resolution that caused duplicated links in project sidebar

See merge request !2593
```
  dece0ac0
03 Aug, 2017 37 commits
- CE->EE: Resolve some more JS conflicts · 3410faf8
  Nick Thomas authored Aug 03, 2017
  
  3410faf8
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-08-03 · dff58616
  Nick Thomas authored Aug 03, 2017
  
  dff58616
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-03 · 930e9f14
  Nick Thomas authored Aug 03, 2017
  
  930e9f14
- Merge branch '34904-specific-async-script-loading-by-using-a-page-variable' into 'master' · 93e96c3f
  Phil Hughes authored Aug 03, 2017
```
Resolve "Specific Async Script Loading by using a Page Variable"

Closes #34904

See merge request !12759
```
  93e96c3f
- Resolve "Specific Async Script Loading by using a Page Variable" · dab08be6
  Tim Zallmann authored Aug 03, 2017
  
  dab08be6
- 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
- CE->EE: Fix errors brought up by static analysis · f8b5265b
  Nick Thomas authored Aug 03, 2017
  
  f8b5265b
- 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
- CE->EE: fix conflicts in app/assets/javascripts/dispatcher.js · 5703e313
  Nick Thomas authored Aug 03, 2017
  
  5703e313
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-03 · d7256552
  Nick Thomas authored Aug 03, 2017
  
  d7256552
- CE->EE: Resolve a missed conflict in app/models/project_wiki.rb · aa9843b8
  Nick Thomas authored Aug 03, 2017
  
  aa9843b8
- Merge branch 'tc-no-todo-service-select-mysql' into 'master' · db271a6b
  Sean McGivern authored Aug 03, 2017
```
Avoid plucking Todo ids in TodoService - take 2

See merge request !11415
```
  db271a6b
- Merge branch 'winh-dropdown-mixin' into 'master' · 00a02d14
  Annabel Dunstone Gray authored Aug 03, 2017
```
Use mixin for new dropdown style

See merge request !13274
```
  00a02d14
- Use mixin for new dropdown style · 8b7f4a6a
  Winnie Hellmann authored Aug 03, 2017
  
  8b7f4a6a
- Make rubocop green again · 7912e157
  Oswaldo Ferreira authored Aug 03, 2017
  
  7912e157
- Merge branch 'dev.referable-inspect' into 'master' · 080cd74a
  Sean McGivern authored Aug 03, 2017
```
implement #inspect for all Referables

See merge request !13285
```
  080cd74a
- 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 '3686_make_tarball_download_url' into 'master' · 9751349d
  Rémy Coutable authored Aug 03, 2017
```
fix #3686 make tarball download url to end with extension

Closes #3686

See merge request !13178
```
  9751349d
- fix #3686 make tarball download url to end with extension · 4974f1ef
  haseeb authored Aug 03, 2017
  
  4974f1ef
- 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
- Merge branch 'use-rspec-support-helper' into 'master' · 29f1fa82
  Rémy Coutable authored Aug 03, 2017
```
Don't include EmailHelpers manually, pick with rspec

See merge request !13257
```
  29f1fa82
- Merge branch '35133_strip_newlines_from_ssh_keys' into 'master' · 2209e35f
  Rémy Coutable authored Aug 03, 2017
```
fix #35133 strip new lines from ssh keys

Closes #35133

See merge request !13234
```
  2209e35f
- fix #35133 strip new lines from ssh keys · ae99f05b
  haseeb authored Aug 03, 2017
  
  ae99f05b
- Adjust tiny typos · 2ea38ba3
  Oswaldo Ferreira authored Aug 03, 2017
  
  2ea38ba3
- Merge branch 'reorganise-issues-indexes-for-sorting' into 'master' · 118dcff0
  Sean McGivern authored Aug 03, 2017
```
Re-organise "issues" indexes for faster ordering

See merge request !13278
```
  118dcff0
- CE->EE: Fix conflicts in docs · 40049c96
  Nick Thomas authored Aug 03, 2017
  
  40049c96
- 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
- use new dropdown styling · 0858a6e2
  Phil Hughes authored Aug 03, 2017
  
  0858a6e2
- CE->EE: Resolve view conflicts · d693a94e
  Nick Thomas authored Aug 03, 2017
  
  d693a94e
- EE port of diff-changed-files-dropdown · 2852464d
  Phil Hughes authored Jul 27, 2017
  
  2852464d
- Add documentation for the new flag · 5a5ddbc4
  Oswaldo Ferreira authored Aug 03, 2017
  
  5a5ddbc4
- CE->EE: resolve remaining spec conflicts · 1be613ac
  Nick Thomas authored Aug 03, 2017
  
  1be613ac
- 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
- Merge branch 'fix-oauth-checkboxes' into 'master' · 57aa5d63
  Filipa Lacerda authored Aug 03, 2017
```
Fixed sign-in restrictions buttons not toggling active state

Closes #35882

See merge request !13270
```
  57aa5d63
- CE->EE: Fix conflicts, one bug, and move EE-only let()s into EE-only contexts · ba7cd49f
  Nick Thomas authored Aug 03, 2017
  
  ba7cd49f
- CE->EE merge: resolve conflicts in gitaly support code · 235cb87e
  Nick Thomas authored Aug 03, 2017
  
  235cb87e