Commits · ccf4e8035c89b3bb82d2803fe32372010055f9b0 · nexedi / gitlab-ce

13 Apr, 2017 13 commits
- Merge branch 'fix-typo-in-exception' into 'master' · ccf4e803
  Robert Speicher authored Apr 13, 2017
```
Fix typo: NotImplemented -> NotImplementedError

See merge request !1634
```
  ccf4e803
- Merge branch '2139-pipelines-minutes' into 'master' · 8ebedab8
  Kamil Trzciński authored Apr 13, 2017
```
Rename build minutes to pipeline minutes

Closes #2139

See merge request !1644
```
  8ebedab8
- Merge branch 'nt/ce-to-ee-thursday' into 'master' · b2e02061
  Rémy Coutable authored Apr 13, 2017
```
CE upstream: Thursday

Closes omnibus-gitlab#1993, gitlab-ce#30642, gitlab-qa#41, and gitlab-ce#30636

See merge request !1647
```
  b2e02061
- Merge branch 'ee-remove-iife-boards-bundle' into 'master' · af053ce5
  Filipa Lacerda authored Apr 13, 2017
```
Remove IIFEs in boards_bundle.js

See merge request !1626
```
  af053ce5
- Merge branch 'ee-remove-iife-cycle-analytics-bundle' into 'master' · e1bcbd90
  Filipa Lacerda authored Apr 13, 2017
```
Remove IIFEs from files in cycle_analytics_bundle.js

See merge request !1627
```
  e1bcbd90
- Resolve merge conflicts · b3f8a978
  Nick Thomas authored Apr 13, 2017
  
  b3f8a978
- Merge remote-tracking branch 'ce/master' into nt/ce-to-ee-thursday · e74833f8
  Nick Thomas authored Apr 13, 2017
  
  e74833f8
- Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' · 9daf4f64
  Alfredo Sumaran authored Apr 13, 2017
```
Show sub-nav under Merge Requests when issue tracker is non-default

Closes #30779

See merge request !10658
```
  9daf4f64
- Show sub-nav under Merge Requests when issue tracker is non-default · 49759fbe
  Kushal Pandya authored Apr 13, 2017
  
  49759fbe
- Revert "Fix registry for projects with uppercases in path" · 37ab3891
  Grzegorz Bizon authored Apr 13, 2017
```
This reverts commit 22726942.
```
  37ab3891
- Fix registry for projects with uppercases in path · 22726942
  Grzegorz Bizon authored Apr 13, 2017
  
  22726942
- Fix typo: NotImplemented -> NotImplementedError · c75908f9
  Stan Hu authored Apr 11, 2017
  
  c75908f9
- Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into 'master' · d7a52716
  Clement Ho authored Apr 13, 2017
```
Fix recent searches icon alignment in Safari

Closes #30642

See merge request !10606
```
  d7a52716
12 Apr, 2017 27 commits
- Merge branch '2149-check-gitlab-elasticsearch-indexer-in-path' into 'master' · 97aa4542
  Douwe Maan authored Apr 12, 2017
```
Resolve "Disable the experimental GitLab elasticsearch indexer checkbox if it's not in $PATH"

Closes #2149

See merge request !1643
```
  97aa4542
- Merge branch 'add-approval-system-note-icons' into 'master' · 051cfe45
  Douwe Maan authored Apr 12, 2017
```
Add icon for approvals in MR

See merge request !1641
```
  051cfe45
- Merge branch 'ee-use-avatars-in-activity-view' into 'master' · cb716716
  Douwe Maan authored Apr 12, 2017
```
Port of use-avatars-in-activity-view to EE

See merge request !1632
```
  cb716716
- Merge branch 'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root' into 'master' · 75af8d92
  Sean McGivern authored Apr 12, 2017
```
Fix the `gitlab:gitlab_shell:check` task

Closes omnibus-gitlab#1993

See merge request !10645
```
  75af8d92
- Merge branch 'rs-fix-already-defined-constant' into 'master' · 2bc9a14f
  Douwe Maan authored Apr 12, 2017
```
Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error

See merge request !10664
```
  2bc9a14f
- Merge branch 'use-avatars-in-activity-view' into 'master' · 3e19ecae
  Douwe Maan authored Apr 12, 2017
```
Use avatars instead of icons in activity view

See merge request !10596
```
  3e19ecae
- Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' · d5143af9
  Alfredo Sumaran authored Apr 12, 2017
```
Update all instances of "fa-refresh" to "fa-spinner"

Closes #22714

See merge request !10490
```
  d5143af9
- Merge branch '30858-system-notes-indent' into 'master' · e802a881
  Jacob Schatz authored Apr 12, 2017
```
Indent system notes on desktop screens

Closes #30858

See merge request !10667
```
  e802a881
- Merge branch 'fix-pdflab-paths' into 'master' · 5c01d089
  Jacob Schatz authored Apr 12, 2017
```
Fix pdflab code including file paths

See merge request !10632
```
  5c01d089
- Merge branch 'change-merged-icon' into 'master' · 9d96167b
  Jacob Schatz authored Apr 12, 2017
```
Update merged icon

See merge request !10635
```
  9d96167b
- Merge branch 'ee-change-merged-icon' into 'master' · 89137fc6
  Jacob Schatz authored Apr 12, 2017
```
Port of change-merged-icon to EE

See merge request !1640
```
  89137fc6
- Merge branch 'zero-downtime-migrations' into 'master' · 3584f7dd
  Douwe Maan authored Apr 12, 2017
```
Prepare for zero downtime migrations

See merge request !9976
```
  3584f7dd
- Port of use-avatars-in-activity-view to EE · 8124c01c
  Annabel Dunstone Gray authored Apr 10, 2017
  
  8124c01c
- Move event icons into events_helper · 8552d120
  Annabel Dunstone Gray authored Apr 12, 2017
  
  8552d120
- Merge branch 'fix-preloading-merge_request_diff' into 'master' · 6ce2cc61
  Stan Hu authored Apr 12, 2017
```
Use preload to avoid Rails using JOIN

See merge request !10666
```
  6ce2cc61
- Merge branch 'reset-new-branch-button' into 'master' · 0fa00e84
  Alfredo Sumaran authored Apr 12, 2017
```
Reset New branch button when issue state changes

Closes #21292

See merge request !5962
```
  0fa00e84
- Reset New branch button when issue state changes · 83c9d8cf
  💃 Winnie 💃 authored Apr 12, 2017
  
  83c9d8cf
- Merge branch 'patch-15' into 'master' · defdf45a
  Achilleas Pipinellis authored Apr 12, 2017
```
Add link to environments on kubernetes.md

See merge request !10555
```
  defdf45a
- Add link to environments on kubernetes.md · 6f136ba1
  Mark Pundsack authored Apr 12, 2017
  
  6f136ba1
- Indent system notes on desktop screens · a7c6a47a
  Annabel Dunstone Gray authored Apr 12, 2017
  
  a7c6a47a
- Merge branch '27729-improve-webpack-dev-environment' into 'master' · b41fc627
  Alfredo Sumaran authored Apr 12, 2017
```
Improve webpack-dev-server compatibility with non-localhost setups.

Closes #27729

See merge request !10604
```
  b41fc627
- Improve webpack-dev-server compatibility with non-localhost setups. · 10deca82
  Mike Greiling authored Apr 12, 2017
  
  10deca82
- port of change-merged-icon to EE · 37365f8e
  Annabel Dunstone Gray authored Apr 11, 2017
  
  37365f8e
- Add changelog entry · 2263ce97
  Lin Jen-Shin authored Apr 13, 2017
  
  2263ce97
- Fix recent searches icon alignment in Safari · ae5c16f7
  Eric Eastwood authored Apr 10, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
```
  ae5c16f7
- Use preload to avoid Rails using JOIN · 39d07799
  Lin Jen-Shin authored Apr 13, 2017
```
Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
```
  39d07799
- Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error · 58cd4c48
  Robert Speicher authored Apr 12, 2017
  
  58cd4c48