Commits · 0ae91de282f6ee4906192268aaaf0c8adb98a32b · nexedi / gitlab-ce

15 May, 2017 5 commits
- Fix lock file spec · 0ae91de2
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0ae91de2
- Fix an EE-specific spec · 96f5089f
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  96f5089f
- Move shared examples to their correct place and create new helpers · 435a4698
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  435a4698
- Re-add the :push_code_to_protected_branches permission · f37b0081
  Rémy Coutable authored May 15, 2017
```
This was removed in gitlab-org/gitlab-ce!11000.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f37b0081
- Fix static analysis offenses · 23f1cafb
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  23f1cafb
12 May, 2017 12 commits
- Fix conflicts · e140833b
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e140833b
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · 0845f00a
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0845f00a
- Reduce complexity of TreeHelper#lock_file_link · 726914c2
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  726914c2
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · df2d3773
  Marin Jankovski authored May 12, 2017
  
  df2d3773
- Fix specs conflicts · 23629867
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  23629867
- Fix Gitlab::Checks::ChangeAccess conflicts · f824edca
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f824edca
- Fix Spinach conflicts · 1bac3670
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1bac3670
- Fix db/schema.rb conflicts · 7ceb1d83
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7ceb1d83
- Fix views conflicts · e5f31fe0
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e5f31fe0
- Resolve controllers, helpers, presenters & serializers conflicts · e2b253dd
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e2b253dd
- Fix Frontend conflicts · 0f335323
  Rémy Coutable authored May 12, 2017
```
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0f335323
- Merge branch 'ee-32096-fix-new-branch-dropdown-position-size' into 'master' · f905490f
  Phil Hughes authored May 12, 2017
```
Fix new branch dropdown position and size -- EE merge edition

Closes gitlab-ce#32096

See merge request !1875
```
  f905490f
11 May, 2017 17 commits
- fix conflict in merge_requests_controller.rb · 90c5df04
  Pawel Chojnacki authored May 11, 2017
  
  90c5df04
- Merge branch '2274-improve-backfill' into 'master' · 375f3438
  Robert Speicher authored May 11, 2017
```
Geo: Resync repositories that have been updated recently

See merge request !1826
```
  375f3438
- Merge branch 'dm-remove-trailing-comma' into 'master' · ff27f4a6
  Robert Speicher authored May 11, 2017
```
Remove trailing comma

See merge request !1882
```
  ff27f4a6
- Remove trailing comma · 649590b3
  Douwe Maan authored May 11, 2017
  
  649590b3
- Merge branch 'bvl-ee-security-patches' into 'master' · f5cb5830
  Robert Speicher authored May 11, 2017
```
Security patches -> EE `master`

See merge request !1864
```
  f5cb5830
- remove app/assets/javascripts/merge_request_widget.js · 674a10bd
  Mike Greiling authored May 11, 2017
  
  674a10bd
- fix conflict in project_new.js · 501a1640
  Mike Greiling authored May 11, 2017
  
  501a1640
- Fix conflicts for CE to EE merge · 328780bd
  kushalpandya authored May 11, 2017
  
  328780bd
- Merge branch '1463-improve-repo-sync' into 'master' · 12319f51
  Robert Speicher authored May 11, 2017
```
Improve Repository Sync (with new SystemHook)

Closes #1463 and #1493

See merge request !1789
```
  12319f51
- Resolve blob/tree conflicts · bb10d783
  Douwe Maan authored May 11, 2017
  
  bb10d783
- Merge branch 'ee-32016-slash-command-strip-fix' into 'master' · 6cae5ef3
  Filipa Lacerda authored May 11, 2017
```
Fix slash commands detection in comments

See merge request !1876
```
  6cae5ef3
- Fix slash commands detection in comments · e482f594
  Kushal Pandya authored May 11, 2017
  
  e482f594
- Merge branch 'ee-32087-fix-flickering-system-notes' into 'master' · 0cdc5b34
  Phil Hughes authored May 11, 2017
```
Fix flickering of system notes -- EE merge edition

Closes gitlab-ce#32087

See merge request !1873
```
  0cdc5b34
- Merge branch 'deltas-only-ee' into 'master' · 5de62109
  Sean McGivern authored May 11, 2017
```
Use new Commit#raw_deltas method

See merge request !1854
```
  5de62109
- Fix new branch dropdown position and size · d0ecf1bb
  Eric Eastwood authored May 10, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32096
```
  d0ecf1bb
- Resolve conflict in User model · 474f678a
  Toon Claes authored May 11, 2017
  
  474f678a
- Fix flickering of system notes · 941191a5
  Eric Eastwood authored May 10, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087

Easy reproduction:

 1. Edit an issue title
 1. Notice the system note added
 1. Switch to another tab and back (to fire the polling immediately)
 1. Notice the flicker (without this fix)
```
  941191a5
10 May, 2017 6 commits
- Merge branch 'ee-27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master' · 32cb7d63
  Robert Speicher authored May 10, 2017
```
[EE] Resolve "Use consistent style for trailing commas"

See merge request !1796
```
  32cb7d63
- Merge branch 'enforce-current-user-usage-on-entities-ee' into 'master' · 7664ecf5
  Kamil Trzciński authored May 10, 2017
```
Make all Serializers receive `current_user` instead `user` [EE]

See merge request !1869
```
  7664ecf5
- Codestyle and changelog changes · ea4858cc
  Gabriel Mazetto authored May 10, 2017
  
  ea4858cc
- Minor cosmetic fixes in hooks admin screen · 5ec85f24
  Gabriel Mazetto authored May 10, 2017
  
  5ec85f24
- Fix migration for MySQL compatibility · 1a21bb78
  Gabriel Mazetto authored May 06, 2017
  
  1a21bb78
- Move GeoRepositoryFetchWorker logic to service class and use ExclusiveLease · a2352c02
  Gabriel Mazetto authored May 05, 2017
  
  a2352c02