Commits · b0f98a2e8e7fde23666d57675f9340fa453d04a8 · nexedi / gitlab-ce

13 Oct, 2017 22 commits
- Merge branch 'gitlab-ee-1312-time-spent-at' into 'master' · b0f98a2e
  Sean McGivern authored Oct 13, 2017
```
added date parameter for time tracking

See merge request gitlab-org/gitlab-ce!14866
```
  b0f98a2e
- Merge branch '39096-upgrade-vuex' into 'master' · b6abad90
  Phil Hughes authored Oct 13, 2017
```
Update Vuex version

Closes #39096

See merge request gitlab-org/gitlab-ce!14868
```
  b6abad90
- Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master' · 96d8c7ff
  Rémy Coutable authored Oct 13, 2017
```
Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory

Closes #37571

See merge request gitlab-org/gitlab-ce!14850
```
  96d8c7ff
- Merge branch 'gitaly-merge' into 'master' · d7326003
  Sean McGivern authored Oct 13, 2017
```
Merge Merge Requests via Gitaly

Closes gitaly#654

See merge request gitlab-org/gitlab-ce!14791
```
  d7326003
- Merge branch 'grpc-1.6.6' into 'master' · 5e0fca33
  Rémy Coutable authored Oct 13, 2017
```
Use grpc 1.6.6

See merge request gitlab-org/gitlab-ce!14821
```
  5e0fca33
- Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory · c30f9246
  Jacopo authored Oct 12, 2017
```
We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs.
```
  c30f9246
- Update Vuex version · c540a231
  Filipa Lacerda authored Oct 13, 2017
  
  c540a231
- Merge branch 'server-flash-click-remove' into 'master' · 6cf3049f
  Filipa Lacerda authored Oct 13, 2017
```
Fixed server rendered flash not being removed on click

See merge request gitlab-org/gitlab-ce!14864
```
  6cf3049f
- Merge Merge Requests via Gitaly · 0aff29f9
  Jacob Vosmaer authored Oct 10, 2017
  
  0aff29f9
- Merge branch 'backport-ee-2869' into 'master' · c08fea6f
  Sean McGivern authored Oct 13, 2017
```
backport for gitlab-ee!2869

See merge request gitlab-org/gitlab-ce!14505
```
  c08fea6f
- Use grpc 1.6.6 · ed1c8389
  Jacob Vosmaer authored Oct 11, 2017
  
  ed1c8389
- Merge branch 'google-protobuf-3.4.1.1' into 'master' · 3dbfd298
  Rémy Coutable authored Oct 13, 2017
```
Use google-protobuf 3.4.1.1

See merge request gitlab-org/gitlab-ce!14820
```
  3dbfd298
- Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master' · c616200f
  Sean McGivern authored Oct 13, 2017
```
Make "merge ongoing" check more consistent

Closes #39032

See merge request gitlab-org/gitlab-ce!14825
```
  c616200f
- added date parameter for time tracking · 945e0684
  Vlad authored Sep 22, 2017
  
  945e0684
- Merge branch 'es-module-broadcast_message' into 'master' · 5843a43c
  Phil Hughes authored Oct 13, 2017
```
Refactor broadcast_message.js

See merge request gitlab-org/gitlab-ce!14853
```
  5843a43c
- Refactor broadcast_message.js · 6ad466a3
  Mike Greiling authored Oct 13, 2017
  
  6ad466a3
- Merge branch '38869-members' into 'master' · 273b116c
  Phil Hughes authored Oct 13, 2017
```
Removes Members, memberExpiration from window object

See merge request gitlab-org/gitlab-ce!14808
```
  273b116c
- Fixed server rendered flash not being removed on click · fc828b40
  Phil Hughes authored Oct 13, 2017
  
  fc828b40
- Merge branch 'revert-8ae7963c' into 'master' · fe3ec2d9
  Rémy Coutable authored Oct 13, 2017
```
Revert "Merge branch '36160-select2-dropdown' into 'master'"

See merge request gitlab-org/gitlab-ce!14851
```
  fe3ec2d9
- Simplify check for running job on Redis · b78954c1
  Oswaldo Ferreira authored Oct 13, 2017
  
  b78954c1
- Merge branch 'fix-cursor-path' into 'master' · 2fd814a3
  Tim Zallmann authored Oct 13, 2017
```
Use image-url instead of url so that asset pipeline can do it's thing

Closes #38980

See merge request gitlab-org/gitlab-ce!14799
```
  2fd814a3
- backport for gitlab-ee!2869 · c9a7f51b
  Simon Knox authored Sep 19, 2017
  
  c9a7f51b
12 Oct, 2017 18 commits
- Merge branch 'evn-add-profiler' into 'master' · e49e443b
  Stan Hu authored Oct 12, 2017
```
Add link to gitlab-profiler

See merge request gitlab-org/gitlab-ce!14775
```
  e49e443b
- Merge branch 'new-mr-repo-editor' into 'master' · 34fd07f6
  Clement Ho authored Oct 12, 2017
```
Add create merge checkbox.

Closes #38626

See merge request gitlab-org/gitlab-ce!14665
```
  34fd07f6
- Add create merge checkbox. · c3195e83
  Jacob Schatz authored Oct 12, 2017
  
  c3195e83
- Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master' · 3555252d
  Kamil Trzciński authored Oct 12, 2017
```
Issue JWT token with registry:catalog:* scope when requested by GitLab admin

Closes #26763 and #18392

See merge request gitlab-org/gitlab-ce!14751
```
  3555252d
- Merge branch 'update-licenses.csv' into 'master' · 8d47e9f8
  Rémy Coutable authored Oct 12, 2017
```
Update dependencies license list

See merge request gitlab-org/gitlab-ce!14845
```
  8d47e9f8
- Revert "Merge branch '36160-select2-dropdown' into 'master'" · 6ca193f9
  Filipa Lacerda authored Oct 12, 2017
```
This reverts merge request !14768
```
  6ca193f9
- Merge branch 'fix/rugged-alternate-paths' into 'master' · 05f46b82
  Douwe Maan authored Oct 12, 2017
```
Fix the format of rugged alternate directory list

Closes #39046

See merge request gitlab-org/gitlab-ce!14840
```
  05f46b82
- Merge branch '34897-delete-branch-after-merge' into 'master' · af3c98bb
  Sean McGivern authored Oct 12, 2017
```
Resolve "remove source branch" checkbox from merge widget being ignored

Closes #34897

See merge request gitlab-org/gitlab-ce!14832
```
  af3c98bb
- Merge branch 'update-installation-doc-for-10-1' into 'master' · f160b2db
  Rémy Coutable authored Oct 12, 2017
```
Update installation doc for 10.1

See merge request gitlab-org/gitlab-ce!14843
```
  f160b2db
- Merge branch 'gitaly-fetch-remote' into 'master' · 400557f0
  Dmitriy Zaporozhets authored Oct 12, 2017
```
Add `Gitlab::Git::Repository#fetch` command

Closes gitaly#586

See merge request gitlab-org/gitlab-ce!14772
```
  400557f0
- Merge branch '37691-subscription-fires-multiple-notifications' into 'master' · ca06ff27
  Sean McGivern authored Oct 12, 2017
```
fix multiple notifications from being sent for multiple labels

Closes #37691

See merge request gitlab-org/gitlab-ce!14798
```
  ca06ff27
- Merge branch 'update-templates' into 'master' · f3832206
  Rémy Coutable authored Oct 12, 2017
```
Update templates

See merge request gitlab-org/gitlab-ce!14844
```
  f3832206
- Update licenses · a548a9f2
  Lin Jen-Shin authored Oct 12, 2017
```
Followed the command from
https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-4-update-the-dependencies-license-list

    bin/bundle exec license_finder report --format=csv
--save=vendor/licenses.csv
```
  a548a9f2
- Merge branch 'cache-issuable-template-names' into 'master' · d964eb11
  Douwe Maan authored Oct 12, 2017
```
Cache issuable template names

See merge request gitlab-org/gitlab-ce!14823
```
  d964eb11
- fix a wrong method call in the refactor · 486da72f
  micael.bergeron authored Oct 12, 2017
  
  486da72f
- fix a whitespace · d1acadce
  Micael Bergeron authored Oct 12, 2017
  
  d1acadce
- fix for discussion · ba6f7699
  Micael Bergeron authored Oct 12, 2017
  
  ba6f7699
- Update templates via: · 12200391
  Lin Jen-Shin authored Oct 12, 2017
```
    bin/rake gitlab:update_templates
```
  12200391