Commits · 167bcdd3c5c0b7ae26543c201bef927fd0b976a2 · nexedi / gitlab-ce

30 Mar, 2018 40 commits
- Removes redundant self in appearance instance methods · 167bcdd3
  Tiago Botelho authored Mar 28, 2018
  
  167bcdd3
- Moves application helper logic for system header and footer to its EE counterpart · aa831b34
  Tiago Botelho authored Mar 27, 2018
  
  aa831b34
- Add i18n to System messages form · b505557d
  André Luís authored Mar 27, 2018
  
  b505557d
- Add comments to system messages selectors · 6055efcc
  André Luís authored Mar 27, 2018
  
  6055efcc
- Adds system message classes to <html> for both devise views · 101ae579
  Tiago Botelho authored Mar 26, 2018
  
  101ae579
- Merge branch '5023-add-system-header-and-footer' of... · 464fdbb9
  Tiago Botelho authored Mar 26, 2018
```
Merge branch '5023-add-system-header-and-footer' of https://gitlab.com/gitlab-org/gitlab-ee into 5023-add-system-header-and-footer
```
  464fdbb9
- Support system header and footer on login pages · 061f08e2
  André Luís authored Mar 26, 2018
  
  061f08e2
- Add styles for system header and system footer · ee03b94e
  André Luís authored Mar 26, 2018
  
  ee03b94e
- Prepare scss for system header and system footer (CE) · 5d5be457
  André Luís authored Mar 26, 2018
  
  5d5be457
- Add specs · ed238c56
  Tiago Botelho authored Mar 16, 2018
  
  ed238c56
- Ports every change to EE folder · 1f1de7f7
  Tiago Botelho authored Mar 15, 2018
  
  1f1de7f7
- Add system header and footer options to the application appearances · b66a26b6
  Tiago Botelho authored Mar 14, 2018
  
  b66a26b6
- Merge branch 'ce-to-ee-2018-03-30' into 'master' · 9ae9d46c
  Marin Jankovski authored Mar 30, 2018
```
CE upstream - 2018-03-30 12:25 UTC

See merge request gitlab-org/gitlab-ee!5183
```
  9ae9d46c
- Merge branch 'remove-duplicate-entry-ci_pipeline_source-docs' into 'master' · cf84228c
  Achilleas Pipinellis authored Mar 30, 2018
```
Remove duplicate entry for CI_PIPELINE_SOURCE

See merge request gitlab-org/gitlab-ee!4850
```
  cf84228c
- Remove duplicate entry for CI_PIPELINE_SOURCE · 91a12059
  Fabio Busatto authored Mar 30, 2018
  
  91a12059
- Merge branch 'approvals-with-target-change-docs' into 'master' · 96b9c038
  Rémy Coutable authored Mar 30, 2018
```
updating approval docs to clarify reset when target branch changes

See merge request gitlab-org/gitlab-ee!5176
```
  96b9c038
- Merge branch 'patch-4' into 'master' · 293a999d
  Rémy Coutable authored Mar 30, 2018
```
Update jobs.md to download artifacts with curl using `-L`

See merge request gitlab-org/gitlab-ee!5168
```
  293a999d
- Update jobs.md to download artifacts with curl using `-L` · 05e67955
  Riccardo Padovani authored Mar 30, 2018
  
  05e67955
- Merge branch 'docs-remove-duplicated-string' into 'master' · 4f5fc4d5
  Rémy Coutable authored Mar 30, 2018
```
remove duplicated string

See merge request gitlab-org/gitlab-ee!5181
```
  4f5fc4d5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-30 · 9351f7a5
  GitLab Bot authored Mar 30, 2018
  
  9351f7a5
- Merge branch 'docs-ha-proxied-ssl' into 'master' · c599b642
  Achilleas Pipinellis authored Mar 30, 2018
```
Add doc section in HA Load Balancer to outline SSL options

See merge request gitlab-org/gitlab-ee!4957
```
  c599b642
- Merge branch 'ee-fix/projects-no-repository-placeholder' into 'master' · 3453c6a6
  Rémy Coutable authored Mar 30, 2018
```
Update no repository placeholder

See merge request gitlab-org/gitlab-ee!5149
```
  3453c6a6
- Merge branch 'ac/pages-port' into 'master' · 80b475d5
  Nick Thomas authored Mar 30, 2018
```
Add gitlab-pages port number to artifacts links, if needed

Closes #44398

See merge request gitlab-org/gitlab-ce!18073
```
  80b475d5
- Merge branch 'zj-update-charlock_holmes' into 'master' · 174bea2d
  Douwe Maan authored Mar 30, 2018
```
Update charlock_holmes to 0.76

See merge request gitlab-org/gitlab-ce!18103
```
  174bea2d
- remove duplicated string · f267dda7
  Alexander Tanayno authored Mar 30, 2018
  
  f267dda7
- Merge branch 'ce-to-ee-2018-03-30' into 'master' · 52611633
  Stan Hu authored Mar 30, 2018
```
CE upstream - 2018-03-30 07:13 UTC

Closes omnibus-gitlab#3351

See merge request gitlab-org/gitlab-ee!5179
```
  52611633
- Merge branch 'add-milestone-path-to-dashboard-milestones-breadcrumb-link' into 'master' · d2b47c76
  Rémy Coutable authored Mar 30, 2018
```
Update dashboard milestones breadcrumb link

See merge request gitlab-org/gitlab-ce!17933
```
  d2b47c76
- Update charlock_holmes to 0.76 · a951b96b
  Zeger-Jan van de Weg authored Mar 30, 2018
```
Didn't compile against newer icu4c versions and was fixed upstream in
https://github.com/brianmario/charlock_holmes/pull/129, which was
releaed in the versions its now locked to.
```
  a951b96b
- Merge branch 'winh-repository-limit-lfs-docs' into 'master' · 6b90caa2
  Achilleas Pipinellis authored Mar 30, 2018
```
Document that LFS is included in the 10GB repository limit on gitlab.com

See merge request gitlab-org/gitlab-ce!18093
```
  6b90caa2
- Document that LFS is included in the 10GB repository limit on gitlab.com · 5716841f
  Winnie Hellmann (back on Tuesday) authored Mar 30, 2018
  
  5716841f
- Merge branch 'git-env-repo' into 'master' · fa1eabe8
  Sean McGivern authored Mar 30, 2018
```
Remove support for absolute dirs from Git::Env

See merge request gitlab-org/gitlab-ce!18024
```
  fa1eabe8
- Remove support for absolute dirs from Git::Env · b9424627
  Jacob Vosmaer (GitLab) authored Mar 30, 2018
  
  b9424627
- Merge branch 'osw-order-boards-by-name' into 'master' · 85418f9a
  Sean McGivern authored Mar 30, 2018
```
[Backport] Order boards dropdown alphabetically

See merge request gitlab-org/gitlab-ce!18065
```
  85418f9a
- Merge branch 'fix-ee_compat_check-for-forks' into 'master' · a49d37ee
  Rémy Coutable authored Mar 30, 2018
```
Fix ee_compat_check for forks

Closes #40788

See merge request gitlab-org/gitlab-ce!17532
```
  a49d37ee
- Merge branch 'osw-order-boards-by-name-ee' into 'master' · 0c16b08b
  Sean McGivern authored Mar 30, 2018
```
Order boards dropdown alphabetically

Closes #4916

See merge request gitlab-org/gitlab-ee!5153
```
  0c16b08b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-30 · 9a740aee
  GitLab Bot authored Mar 30, 2018
  
  9a740aee
- Merge branch 'ce-to-ee-2018-03-29' into 'master' · c7ec27fc
  Stan Hu authored Mar 30, 2018
```
CE upstream - 2018-03-29 12:26 UTC

Closes gitlab-com/infrastructure#3874, #3092, #5359, gitaly#1084, and gitlab-ce#43929

See merge request gitlab-org/gitlab-ee!5165
```
  c7ec27fc
- Merge branch 'revert-7c626d2d' into 'master' · 0ce07326
  Mike Greiling authored Mar 30, 2018
```
Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'"

See merge request gitlab-org/gitlab-ce!18096
```
  0ce07326
- Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'" · 87ef5e32
  Stan Hu authored Mar 30, 2018
```
This reverts merge request !17971
```
  87ef5e32
- Fix spec failure in spec/lib/gitlab/auth/ldap/access_spec.rb · 8645bc96
  Stan Hu authored Mar 29, 2018
  
  8645bc96