Commits · 63b369be1bef7bf287723c87f48a92bf10bc97ae · nexedi / gitlab-ce

13 Jul, 2017 10 commits
- Fix scss_lint errors · 63b369be
  Nick Thomas authored Jul 13, 2017
  
  63b369be
- Fix merge conflicts · b8c39c69
  Nick Thomas authored Jul 13, 2017
  
  b8c39c69
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-07-13 · a07992d1
  Nick Thomas authored Jul 13, 2017
  
  a07992d1
- Merge branch '34835-environment-truncate-job' into 'master' · cbcba158
  Filipa Lacerda authored Jul 13, 2017
```
Truncate job on environment view

Closes #34835

See merge request !12818
```
  cbcba158
- Merge branch 'lib-git-gitaly' into 'master' · e0ce648d
  Sean McGivern authored Jul 13, 2017
```
Add Gitaly notes to Gitlab::Git, delete diff options

See merge request !12814
```
  e0ce648d
- Merge branch '35036-commit-page-dropdown' into 'master' · d0b50e44
  Phil Hughes authored Jul 13, 2017
```
Fix i18n string in commit page options dropdown

Closes #35036

See merge request !12831
```
  d0b50e44
- Merge branch 'navigation-toggle' into 'master' · d741df1d
  Phil Hughes authored Jul 13, 2017
```
Fix wording of nav toggle

See merge request !12796
```
  d741df1d
- Merge branch 'mr-branch-link-use-tree-ee' into 'master' · 16b3dfe7
  Robert Speicher authored Jul 13, 2017
```
MR branch link now links to tree instead of commits (EE)

Closes #2890

See merge request !2416
```
  16b3dfe7
- Fix i18n string in commit page options dropdown · 0c75742f
  Balasankar C authored Jul 13, 2017
  
  0c75742f
- Merge branch... · 3c197e74
  Robert Speicher authored Jul 13, 2017
```
Merge branch '34780-restricted-visibility-levels-in-admin-application-settings-looks-off' into 'master'

Fix wrong helper used for adding context for translations.

Closes #34780

See merge request !12731
```
  3c197e74
12 Jul, 2017 30 commits
- Merge branch 'sh-fix-award-emoji-spec' into 'master' · beea5a3e
  Rémy Coutable authored Jul 11, 2017
```
Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`

Closes gitlab-ee#2890

See merge request !12770
```
  beea5a3e
- Merge branch 'enable-scss-lint-declaration-order' into 'master' · a2961a1c
  Clement Ho authored Jul 12, 2017
```
Enable DeclarationOrder in scss-lint

See merge request !12805
```
  a2961a1c
- Merge branch 'enable-scss-lint-bang-format' into 'master' · 04f9552d
  Clement Ho authored Jul 12, 2017
```
Enable BangFormat in scss-lint

See merge request !12815
```
  04f9552d
- Merge branch 'mr-branch-link-use-tree' into 'master' · b4ea7216
  Robert Speicher authored Jul 12, 2017
```
MR branch link now links to tree instead of commits

Closes #34243

See merge request !12763
```
  b4ea7216
- Merge branch '1552-kerberos-ldap-auto-link' into 'master' · 8bd15968
  Douwe Maan authored Jul 12, 2017
```
Automatically link Kerberos users and LDAP people

Closes #1552

See merge request !2405
```
  8bd15968
- Fix wrong helper used for adding context for translations. · a90ca93c
  Ruben Davila authored Jul 12, 2017
```
Additionally some missing translations were added
```
  a90ca93c
- Truncate job on environment view · 4430afc1
  Annabel Dunstone Gray authored Jul 12, 2017
  
  4430afc1
- Merge branch 'gitlab-shell-5-3-1' into 'master' · af713ce7
  Stan Hu authored Jul 12, 2017
```
Update gitlab-shell to v5.3.1

Closes gitlab-shell#92

See merge request !12817
```
  af713ce7
- Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master' · 9bfe49c2
  Robert Speicher authored Jul 12, 2017
```
Migrate Workhorse SendBlob to Gitaly

Closes gitaly#356

See merge request !12313
```
  9bfe49c2
- Merge branch 'hotpatch-mirror-available-capacity-going-below-zero' into 'master' · b04e2489
  Robert Speicher authored Jul 12, 2017
```
Reset available mirror capacity to 0 when it falls below 0

See merge request !2409
```
  b04e2489
- Merge branch 'mr-branch-link-use-tree' into 'master' · 777ec210
  Robert Speicher authored Jul 12, 2017
```
MR branch link now links to tree instead of commits

Closes #34243

See merge request !12763
```
  777ec210
- Merge branch 'improve-artifacts-file-store-ee' into 'master' · 6b2a73a1
  Rémy Coutable authored Jul 12, 2017
```
Artifacts store does not use default value

See merge request !2411
```
  6b2a73a1
- Artifacts store does not use default value · 1e5b40e8
  Kamil Trzciński authored Jul 12, 2017
  
  1e5b40e8
- Try to eliminate unused diff options · 0b0e89ef
  Jacob Vosmaer authored Jul 12, 2017
  
  0b0e89ef
- Merge branch 'backport-ee-2405' into 'master' · bc1bb506
  Douwe Maan authored Jul 12, 2017
```
Backport "Automatically link Kerberos users and LDAP people" changes to CE

See merge request !12807
```
  bc1bb506
- Merge branch '34797_add_italian_translations_of_pipeline_charts' into 'master' · 92949e05
  Douwe Maan authored Jul 12, 2017
```
Add Italian translations of Pipeline Charts

Closes #34797

See merge request !12700
```
  92949e05
- Deep link · a2030dc1
  Sid Sijbrandij authored Jul 12, 2017
  
  a2030dc1
- Automatically link kerberos users to LDAP people · d062a5cc
  Nick Thomas authored Jul 11, 2017
  
  d062a5cc
- Update gitlab-shell to v5.3.1 · c718d7fa
  Sean McGivern authored Jul 12, 2017
```
This fixes an issue where the merge request URLs for a push returned an error,
which made gitlab-shell show a stacktrace to the user.
```
  c718d7fa
- Fix wording of nav toggle · 1e7e927e
  Annabel Dunstone Gray authored Jul 11, 2017
  
  1e7e927e
- Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master' · 3bce3014
  Clement Ho authored Jul 12, 2017
```
Enable UnnecessaryParentReference in scss-lint

See merge request !12738
```
  3bce3014
- Merge branch 'fix-rebase-permissions-check' into 'master' · b2a8a27b
  Rémy Coutable authored Jul 12, 2017
```
Fix access checks for rebasing an MR

Closes #2891

See merge request !2414
```
  b2a8a27b
- Add Gitaly notes and annotations to Gitlab::Git · 47c844bf
  Jacob Vosmaer authored Jul 12, 2017
  
  47c844bf
- Merge branch 'docs/elastic' into 'master' · c59047da
  Achilleas Pipinellis authored Jul 12, 2017
```
Split Elasticsearch docs to admin and user

Closes #2056

See merge request !2375
```
  c59047da
- Fix spec name grammer · 531157f5
  Clement Ho authored Jul 12, 2017
  
  531157f5
- Enable BangFormat in scss-lint · 2baef395
  Takuya Noguchi authored Jul 12, 2017
  
  2baef395
- Merge branch '34534-update-vue-resource' into 'master' · 7fb7acd7
  Phil Hughes authored Jul 12, 2017
```
Update vue-resource

Closes #34534

See merge request !12658
```
  7fb7acd7
- Merge branch '34534-update-vue-resource-ee' into 'master' · 43d59a66
  Phil Hughes authored Jul 12, 2017
```
Port of CE Update vue-resource

See merge request !2378
```
  43d59a66
- Update vue-resource · aaa78199
  Filipa Lacerda authored Jul 12, 2017
  
  aaa78199
- Port of CE Update vue-resource · 0b23a31d
  Filipa Lacerda authored Jul 12, 2017
  
  0b23a31d