Commits · 96d8a5adf34f394a330684c08873a93bb791e1d3 · nexedi / gitlab-ce

13 Apr, 2018 3 commits
- Fix rubocop · 96d8a5ad
  Filipa Lacerda authored Apr 13, 2018
  
  96d8a5ad
- Remove unused imports · 5b171cee
  Filipa Lacerda authored Apr 13, 2018
  
  5b171cee
- Render only one error message per diff · a236b5e6
  Filipa Lacerda authored Apr 13, 2018
```
Move html to haml file instead of JS
```
  a236b5e6
12 Apr, 2018 22 commits
- Fixes unresolved discussions rendering the error state instead of the diff · b01fd7ad
  Filipa Lacerda authored Apr 12, 2018
  
  b01fd7ad
- Merge branch 'jousch/gitlab-ce-ci-untracked-doku-docs' into 'master' · 1e54e30f
  Rémy Coutable authored Apr 12, 2018
```
Add dedicated info about artifacts:untracked to GitLab CI's README.md

See merge request gitlab-org/gitlab-ce!18342
```
  1e54e30f
- Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master' · f97d87ea
  Achilleas Pipinellis authored Apr 12, 2018
```
Mention reply-by-email in user doc

Closes gitlab-ee#5103

See merge request gitlab-org/gitlab-ce!18310
```
  f97d87ea
- Merge branch 'workhorse-4-1-0' into 'master' · 556a6da7
  Douwe Maan authored Apr 12, 2018
```
Update GitLab Workhorse to v4.1.0

See merge request gitlab-org/gitlab-ce!18327
```
  556a6da7
- Merge branch 'docs-update-instal-guide-10-7' into 'master' · 038367c3
  James Lopez authored Apr 12, 2018
```
Updates installation and update guides

See merge request gitlab-org/gitlab-ce!18337
```
  038367c3
- Fix indentation · 2edcd9d0
  Filipa Lacerda authored Apr 12, 2018
  
  2edcd9d0
- Merge branch '10-7-update-files' into 'master' · 39c9091a
  James Lopez authored Apr 12, 2018
```
Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates

See merge request gitlab-org/gitlab-ce!18338
```
  39c9091a
- Add dedicated info about artifacts:untracked to GitLab CI's README.md · be6f17cf
  Josef Glatz authored Feb 20, 2018
  
  be6f17cf
- Merge branch 'move-help-state-vue-component' into 'master' · ef04186f
  Filipa Lacerda authored Apr 12, 2018
```
Move TimeTrackingHelpState vue component

See merge request gitlab-org/gitlab-ce!18319
```
  ef04186f
- Mention reply-by-email in user doc · 0d42e70c
  Lin Jen-Shin authored Apr 11, 2018
  
  0d42e70c
- Merge branch 'winh-dropdown-entry-unlocking' into 'master' · 8e0e9d6d
  Phil Hughes authored Apr 12, 2018
```
Remove green background from unlock button in admin area

Closes #41269

See merge request gitlab-org/gitlab-ce!18288
```
  8e0e9d6d
- Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates · d671d058
  Filipa Lacerda authored Apr 12, 2018
  
  d671d058
- Updates missing links · 54b13dd4
  Filipa Lacerda authored Apr 12, 2018
  
  54b13dd4
- Updates installation and update guides · 798f815e
  Filipa Lacerda authored Apr 12, 2018
  
  798f815e
- Merge branch... · db6854b2
  Douwe Maan authored Apr 12, 2018
```
Merge branch 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master'

Backport of EE !4989

See merge request gitlab-org/gitlab-ce!18238
```
  db6854b2
- Merge branch 'rendering-markdown-multiple-projects' into 'master' · 9ec3a8b0
  Douwe Maan authored Apr 12, 2018
```
Optimise rendering of Markdown documents that belong to different projects

See merge request gitlab-org/gitlab-ce!18157
```
  9ec3a8b0
- Merge branch '41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master' · ef44ebf8
  Achilleas Pipinellis authored Apr 12, 2018
```
Update Auto-Devops docs to mention new REPLICAS env var

See merge request gitlab-org/gitlab-ce!18036
```
  ef44ebf8
- Update Auto-Devops docs to mention new REPLICAS env var · 76f240a5
  Dylan Griffith authored Apr 12, 2018
  
  76f240a5
- Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master' · b9d868e3
  Marin Jankovski authored Apr 12, 2018
```
Fix empty state for build that does not have a trace

Closes #45204

See merge request gitlab-org/gitlab-ce!18278
```
  b9d868e3
- Merge branch '45245-rspec-flaky-pruner-failure-job-failed-62392094' into 'master' · 85b873e9
  Grzegorz Bizon authored Apr 12, 2018
```
Resolve "RSpec Flaky pruner failure / Job Failed #62392094"

Closes #45245

See merge request gitlab-org/gitlab-ce!18316
```
  85b873e9
- Backport of EE !4989 · d28b1dfc
  Rubén Dávila authored Apr 11, 2018
  
  d28b1dfc
- Update GitLab Workhorse to v4.1.0 · cbcf46e7
  Nick Thomas authored Apr 12, 2018
  
  cbcf46e7
11 Apr, 2018 15 commits
- Fix scripts/prune-old-flaky-specs requires Bundler to run · d8a58f62
  Rémy Coutable authored Apr 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d8a58f62
- Merge branch 'fix/wiki-find-file-gitaly' into 'master' · 947ed8b8
  Robert Speicher authored Apr 11, 2018
```
Fix finding wiki file when Gitaly is enabled

Closes gitaly#1126

See merge request gitlab-org/gitlab-ce!18317
```
  947ed8b8
- Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into 'master' · 84c70f43
  Nick Thomas authored Apr 11, 2018
```
[CE Backport] Propagate broadcast messages to secondaries

See merge request gitlab-org/gitlab-ce!18324
```
  84c70f43
- Backport: Propagate broadcast messages to secondaries · 1ce0595b
  Michael Kozono authored Apr 11, 2018
  
  1ce0595b
- Merge branch 'winh-protection-push-dropdowns-backport' into 'master' · 9f8d91c9
  Clement Ho authored Apr 11, 2018
```
Limit dropdown toggle width for protected branches / tags

See merge request gitlab-org/gitlab-ce!18212
```
  9f8d91c9
- Merge branch 'winh-sprintf-no-escape-docs' into 'master' · 8206cae7
  Clement Ho authored Apr 11, 2018
```
Document example for sprintf without escaping

See merge request gitlab-org/gitlab-ce!16712
```
  8206cae7
- Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master' · ac2271f8
  Clement Ho authored Apr 11, 2018
```
Add i18n and update specs for UnresolvedDiscussions vue component

See merge request gitlab-org/gitlab-ce!17866
```
  ac2271f8
- Merge branch '41748-vertical-misalignment-login-box' into 'master' · e77ecf62
  Clement Ho authored Apr 11, 2018
```
Vertical misalignment of login box header

Closes #41748

See merge request gitlab-org/gitlab-ce!16275
```
  e77ecf62
- Merge branch 'winh-single-karma-test' into 'master' · 54691d3d
  Clement Ho authored Apr 11, 2018
```
Add possibility to filter Karma spec files by path

Closes #40899

See merge request gitlab-org/gitlab-ce!16102
```
  54691d3d
- Merge branch 'move-estimate-only-pane-vue-component' into 'master' · 615f9578
  Filipa Lacerda authored Apr 11, 2018
```
Move TimeTrackingEstimateOnlyPane vue component

See merge request gitlab-org/gitlab-ce!18318
```
  615f9578
- Refactor CSS to eliminate vertical misalignment of login nav · 21e6c7ac
  Takuya Noguchi authored Jan 08, 2018
  
  21e6c7ac
- Merge branch 'blackst0ne-rails5-update-event-subclass-from-attributes' into 'master' · 6593b2db
  Yorick Peterse authored Apr 11, 2018
```
[Rails5] Update Event#subclass_from_attributes method

See merge request gitlab-org/gitlab-ce!18312
```
  6593b2db
- Merge branch 'docs/monitoring-index' into 'master' · 8f0e9e01
  🚄 Job van der Voort 🚀 authored Apr 11, 2018
```
Link Monitor docs to the front page

Closes #45006

See merge request gitlab-org/gitlab-ce!18314
```
  8f0e9e01
- Move TimeTrackingHelpState vue component · 93c55f58
  George Tsiolis authored Apr 11, 2018
  
  93c55f58
- Move TimeTrackingEstimateOnlyPane vue component · 3f204b55
  George Tsiolis authored Apr 11, 2018
  
  3f204b55