Commits · 78f7080e8ba4f1c8af80a441f947532fa236312c · nexedi / gitlab-ce

14 Jul, 2017 29 commits
- Merge branch 'refactor-user-bundle' into 'master' · 78f7080e
  Clement Ho authored Jul 14, 2017
```
Refactor user bundle

See merge request !12728
```
  78f7080e
- Refactor user bundle · 5f615276
  Mike Greiling authored Jul 14, 2017
  
  5f615276
- Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master' · 60b91b46
  Grzegorz Bizon authored Jul 14, 2017
```
Remove the rest of `trigger_schedule` related codes

Closes #32032

See merge request !12839
```
  60b91b46
- Merge branch '19629-remove-inactive-tokens-list' into 'master' · e90c382c
  Filipa Lacerda authored Jul 14, 2017
```
Remove Inactive Personal Access Tokens list from Access Tokens page

Closes #19629

See merge request !12866
```
  e90c382c
- Merge branch 'revert-73579e66' into 'master' · c42e481f
  Grzegorz Bizon authored Jul 14, 2017
```
Revert "Merge branch 'revert-2c879643' into 'master'"

See merge request !12870
```
  c42e481f
- Update test description to reflect behaviour · fa0e43bb
  kushalpandya authored Jul 14, 2017
  
  fa0e43bb
- Revert "Merge branch 'revert-2c879643' into 'master'" · 8170384d
  Sean McGivern authored Jul 14, 2017
```
This reverts merge request !12633
```
  8170384d
- Merge branch 'backport-ee-mysql2-version' into 'master' · 7fbcdfb0
  Sean McGivern authored Jul 14, 2017
```
Update the mysql2 gem to v0.4.5

See merge request !12859
```
  7fbcdfb0
- Merge branch 'instrument-ability' into 'master' · 970f20e1
  Yorick Peterse authored Jul 14, 2017
```
Instrument Ability

See merge request !12865
```
  970f20e1
- Merge branch 'gitlab-git-repository-log' into 'master' · 34da5a5d
  Sean McGivern authored Jul 14, 2017
```
Gitlab::Git shuffling and Gitaly annotations

See merge request !12849
```
  34da5a5d
- Merge branch 'bvl-shared-views-for-protected-refs' into 'master' · 7324d86f
  Sean McGivern authored Jul 14, 2017
```
Extract partials from the protected_branches & protected_tags views

See merge request !12864
```
  7324d86f
- Merge branch 'find-file-no-longer-inline' into 'master' · 0c4f512b
  Filipa Lacerda authored Jul 14, 2017
```
Move find file URL out of global variable

See merge request !12846
```
  0c4f512b
- Add changelog entry · 5078d223
  kushalpandya authored Jul 14, 2017
  
  5078d223
- Instrument Ability · a5b8d4bc
  Sean McGivern authored Jul 14, 2017
  
  a5b8d4bc
- Update tests to cover removal of inactive tokens table · ba1dca79
  kushalpandya authored Jul 14, 2017
  
  ba1dca79
- Remove inactive tokens table · aca213ad
  kushalpandya authored Jul 14, 2017
  
  aca213ad
- Merge branch 'fixes-for-internal-auth-disabled' into 'master' · 1afdbe32
  Sean McGivern authored Jul 14, 2017
```
Fixes needed when GitLab sign-in is not enabled

See merge request !12491
```
  1afdbe32
- Merge branch '35035-sidebar-job-spaces' into 'master' · febd3884
  Phil Hughes authored Jul 14, 2017
```
Fix spacing in sidebar

Closes #35035

See merge request !12844
```
  febd3884
- Fix spacing in sidebar · 948afa2a
  Filipa Lacerda authored Jul 14, 2017
  
  948afa2a
- Use shared protected tag views for CE-partials · 1814c677
  Bob Van Landuyt authored Jul 10, 2017
```
So they are reusable for EE later
```
  1814c677
- Use shared protected branches views for CE-partials · 9654295d
  Bob Van Landuyt authored Jul 07, 2017
  
  9654295d
- Merge branch 'patch-16' into 'master' · 6fb712a0
  Achilleas Pipinellis authored Jul 14, 2017
```
Fixed typo

See merge request !12862
```
  6fb712a0
- Merge branch 'sh-fix-nil-broadcast-message' into 'master' · 6f81fc44
  Sean McGivern authored Jul 14, 2017
```
Handle case when BroadcastMessage.current is nil

Closes #35094

See merge request !12860
```
  6f81fc44
- Fixed typo · 9cf5cc31
  kamesh authored Jul 14, 2017
  
  9cf5cc31
- Handle nil BroadcastMessage.current in the views · e6cd2353
  Stan Hu authored Jul 13, 2017
  
  e6cd2353
- Handle case when BroadcastMessage.current is nil · 0e23d1a7
  Stan Hu authored Jul 13, 2017
```
Somehow Rails.cache.fetch occasionally returns `nil` values, which causes
this endpoint to crash.

Closes #35094
```
  0e23d1a7
- Merge branch 'dm-merge-request-creation-error' into 'master' · dbcc0e03
  Stan Hu authored Jul 14, 2017
```
Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set

Closes #35077

See merge request !12856
```
  dbcc0e03
- Update the mysql2 gem to v0.4.5 · a922cb88
  Nick Thomas authored Jul 14, 2017
  
  a922cb88
- Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set · 87cb74a7
  Douwe Maan authored Jul 13, 2017
  
  87cb74a7
13 Jul, 2017 11 commits
- Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master' · c306e403
  Clement Ho authored Jul 13, 2017
```
Increase width of dropdown menus

Closes #34989

See merge request !12809
```
  c306e403
- Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' into 'master' · 6658c706
  Douwe Maan authored Jul 13, 2017
```
Supplement Portuguese Brazil translation of Project Page & Repository Page

Closes #33672

See merge request !12156
```
  6658c706
- Merge branch 'reload-new-navigation-option-change' into 'master' · 262da1f1
  Filipa Lacerda authored Jul 13, 2017
```
Reload page after changing navigation preference

Closes #34968

See merge request !12833
```
  262da1f1
- Increase width of dropdown menus automatically up to 500 px · f01e71a8
  Thomas Wucher authored Jul 12, 2017
  
  f01e71a8
- Indirectly migrate count_commits_between to Gitaly · 5b18f733
  Jacob Vosmaer authored Jul 13, 2017
  
  5b18f733
- More Gitaly annotations · a87cca5f
  Jacob Vosmaer authored Jul 13, 2017
  
  a87cca5f
- Merge branch 'note-on-mysql-for-db-seed' into 'master' · c3c1a357
  Rémy Coutable authored Jul 13, 2017
```
Add more notes about developer seeds

See merge request !12836
```
  c3c1a357
- Add more notes about developer seeds · 170ec4af
  Lin Jen-Shin (godfat) authored Jul 13, 2017
  
  170ec4af
- Merge branch 'backport-mr-create-service-changes' into 'master' · cca3d9bf
  Grzegorz Bizon authored Jul 13, 2017
```
Backport MR create service changes from EE

See merge request !12808
```
  cca3d9bf
- missed one... · 6bbdce64
  Phil Hughes authored Jul 13, 2017
  
  6bbdce64
- Move find file URL out of global variable · e578530f
  Phil Hughes authored Jul 13, 2017
```
Part of #34903
```
  e578530f