Commits · bf3a3f3652704fb261e6220e2199830ea22ec8d3 · Léo-Paul Géneau / gitlab-ce

23 Jun, 2017 29 commits
- fix api and controller issues · bf3a3f36
  James Lopez authored Jun 16, 2017
  
  bf3a3f36
- fix specs · 36bc2e90
  James Lopez authored Jun 16, 2017
  
  36bc2e90
- update notification settings, fix api specs · ef6a4240
  James Lopez authored Jun 15, 2017
  
  ef6a4240
- update preferences controller · 04bb82c8
  James Lopez authored Jun 15, 2017
  
  04bb82c8
- updated emails, notifications and passwords controller · 94980852
  James Lopez authored Jun 15, 2017
  
  94980852
- fix profiles controller · 968809dc
  James Lopez authored Jun 15, 2017
  
  968809dc
- finish off refactoring users controller · aa158dd7
  James Lopez authored Jun 15, 2017
  
  aa158dd7
- update users controller · 85b5a8cf
  James Lopez authored Jun 14, 2017
  
  85b5a8cf
- refactor profiles controller and update service · 1c14805f
  James Lopez authored Jun 14, 2017
  
  1c14805f
- update profiles controller to use new service · 01378ab4
  James Lopez authored Jun 14, 2017
  
  01378ab4
- use update service on ldap call and updated specs and service · 59c3968c
  James Lopez authored Jun 14, 2017
  
  59c3968c
- added bang option to spec · cf628631
  James Lopez authored Jun 13, 2017
  
  cf628631
- fix spec · 11044ab1
  James Lopez authored Jun 13, 2017
  
  11044ab1
- ported EE user service to CE · 5f0e7873
  James Lopez authored Jun 13, 2017
  
  5f0e7873
- Merge branch 'winh-promise-rejects-fail-tests' into 'master' · 801cf923
  Phil Hughes authored Jun 23, 2017
```
Make JavaScript tests fail for unhandled Promise rejections

Closes #33845 and #33623

See merge request !12264
```
  801cf923
- Make JavaScript tests fail for unhandled Promise rejections · 925eea26
  Winnie Hellmann authored Jun 23, 2017
  
  925eea26
- Merge branch 'hot-reload' into 'master' · 9c7bf123
  Tim Zallmann authored Jun 23, 2017
```
hot reloading for .vue files

Closes #33729

See merge request !12180
```
  9c7bf123
- Merge branch '31574-bootstrap-form-builder' into 'master' · cf131aa4
  Phil Hughes authored Jun 23, 2017
```
Add bootstrap_form gem

See merge request !10985
```
  cf131aa4
- Merge branch '33992-mr-target-avatar' into 'master' · 0c126dc8
  Phil Hughes authored Jun 23, 2017
```
Add padding to target branch container

Closes #33992

See merge request !12353
```
  0c126dc8
- Merge branch 'fix-sidebar-scroll-jump' into 'master' · f76ed815
  Phil Hughes authored Jun 23, 2017
```
Remove layout nav from scroll calculation

Closes #33984

See merge request !12399
```
  f76ed815
- Merge branch '34095-permalinks' into 'master' · 182db09e
  Phil Hughes authored Jun 23, 2017
```
Fix offset for fixed nav

Closes #34095

See merge request !12365
```
  182db09e
- Fix offset for fixed nav · 588d5564
  Annabel Dunstone Gray authored Jun 23, 2017
  
  588d5564
- Merge branch 'notes-es-class-syntax' into 'master' · 61064006
  Tim Zallmann authored Jun 23, 2017
```
Refactor Notes into ES class syntax

See merge request !12254
```
  61064006
- Merge branch 'dm-unnecessary-top-padding' into 'master' · a625e0e4
  Sean McGivern authored Jun 23, 2017
```
Remove unnecessary top padding on group MR index

See merge request !12392
```
  a625e0e4
- Merge branch '34120-environment-detail-bug' into 'master' · 8fa464e6
  Phil Hughes authored Jun 23, 2017
```
Fix mobile environment detail view

Closes #34120

See merge request !12382
```
  8fa464e6
- Fix mobile environment detail view · 6695cd9d
  Annabel Dunstone Gray authored Jun 23, 2017
  
  6695cd9d
- Merge branch 'project-settings-container-width' into 'master' · f09aa6b7
  Annabel Dunstone Gray authored Jun 23, 2017
```
Added limited width container to project settings

See merge request !12045
```
  f09aa6b7
- Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master' · a4ca7e8b
  Annabel Dunstone Gray authored Jun 23, 2017
```
Fix dropdown position for the new button on mobile for the top navbar

Closes #34139

See merge request !12388
```
  a4ca7e8b
- Fix dropdown position for the new button on mobile for the top navbar · c79540c6
  Jose Ivan Vargas Lopez authored Jun 23, 2017
  
  c79540c6
22 Jun, 2017 11 commits
- refactor Notes class to ES class syntax · ca25ad26
  Mike Greiling authored Jun 18, 2017
  
  ca25ad26
- Remove layout nav from scroll calculation · c12172ee
  Annabel Dunstone Gray authored Jun 22, 2017
  
  c12172ee
- Merge branch 'rs-revert-bootsnap' into 'master' · 65c2a5fe
  Stan Hu authored Jun 22, 2017
```
Revert "Merge branch 'rs-bootsnap' into 'master'"

Closes #34134, #34106, and #34084

See merge request !12389
```
  65c2a5fe
- Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' into 'master' · 0c351e21
  Annabel Dunstone Gray authored Jun 22, 2017
```
Resolve ""Add Members" drop-down doesn't separate Name/Username"

Closes #33981

See merge request !12376
```
  0c351e21
- Resolve ""Add Members" drop-down doesn't separate Name/Username" · d49d63a0
  Tim Zallmann authored Jun 22, 2017
  
  d49d63a0
- Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master' · ab227473
  Yorick Peterse authored Jun 22, 2017
```
Add `datetime_with_timezone` to table definition

See merge request !12292
```
  ab227473
- Merge branch '33940-cache-flipper_gate-query' into 'master' · 6e66473f
  Robert Speicher authored Jun 22, 2017
```
Add the Flipper::Middleware::Memoizer middleware

Closes #33940

See merge request !12359
```
  6e66473f
- Remove unnecessary top padding on group MR index · 2b0b0026
  Douwe Maan authored Jun 22, 2017
  
  2b0b0026
- Merge branch 'awards-handler-class-syntax' into 'master' · bf0b3d83
  Jacob Schatz authored Jun 22, 2017
```
Refactor AwardsHandler into ES class syntax

See merge request !12239
```
  bf0b3d83
- Revert "Merge branch 'rs-bootsnap' into 'master'" · 171e1bb4
  Robert Speicher authored Jun 22, 2017
```
This reverts commit 95138a9c, reversing
changes made to 66aad16d.
```
  171e1bb4
- Merge branch 'fix/properly-encode-gitaly-diffs' into 'master' · 826d5b7b
  Robert Speicher authored Jun 22, 2017
```
Encode Gitaly diff patches properly

See merge request !12368
```
  826d5b7b