Commits · b4d1ce0a60d1482ea5038cc76ae982702edc2c55 · nexedi / gitlab-ce

11 Oct, 2018 20 commits
- Use variable for dismiss button padding · b4d1ce0a
  George Tsiolis authored Sep 04, 2018
  
  b4d1ce0a
- Update envirnoments app spec · 288c8bce
  George Tsiolis authored Sep 04, 2018
  
  288c8bce
- Removed `aria-hidden` attribute from icon vue components · 54327d0a
  George Tsiolis authored Sep 04, 2018
  
  54327d0a
- Add aria-hidden attribute to icon vue component · 6fa891fd
  George Tsiolis authored Sep 04, 2018
  
  6fa891fd
- Added variables to styles and computed property · c088057f
  George Tsiolis authored Jul 25, 2018
  
  c088057f
- Update environment specs to match icons used in EnvironmentItem component · 6920bfd1
  George Tsiolis authored Jul 25, 2018
  
  6920bfd1
- Update environments specs · e8a4333e
  George Tsiolis authored Jul 25, 2018
  
  e8a4333e
- Replace icons in ProjectSelect vue component · be5dcd2e
  George Tsiolis authored Jul 25, 2018
  
  be5dcd2e
- Change Icon component in HTML to kebab-case · 7456230a
  George Tsiolis authored Jul 20, 2018
  
  7456230a
- Replace icons in IssueCardInner vue component · d7d13f76
  George Tsiolis authored Jul 20, 2018
  
  d7d13f76
- Replace icons in /cycle_analytics and /explore/groups banners · 448b3aa6
  George Tsiolis authored Jul 20, 2018
  
  448b3aa6
- Replace icons in EnvironmentActions vue component · fa594a25
  George Tsiolis authored Jul 20, 2018
  
  fa594a25
- Replace icons in Boards vue components · f2cb958c
  George Tsiolis authored Jul 20, 2018
  
  f2cb958c
- Replace icons in EnvironmentItem vue component · ef67147a
  George Tsiolis authored Jul 20, 2018
  
  ef67147a
- Replace icons in FrequentItemsSearchInput vue component · 12e5ba1d
  George Tsiolis authored Jul 20, 2018
  
  12e5ba1d
- Merge branch 'ce-to-ee-2018-10-10' into 'master' · 42034ca9
  Stan Hu authored Oct 11, 2018
```
CE upstream - 2018-10-10 18:21 UTC

Closes gitlab-org/quality/nightly#22

See merge request gitlab-org/gitlab-ee!7868
```
  42034ca9
- Resolve conflicts in app/assets/javascripts/boards/index.js · 0bb26053
  Stan Hu authored Oct 10, 2018
  
  0bb26053
- Resolve conflicts in spec/javascripts/boards/mock_data.js · c7a89fa4
  Stan Hu authored Oct 10, 2018
  
  c7a89fa4
- Resolve conflicts in app/assets/javascripts/boards/stores/boards_store.js · 3290c83b
  Stan Hu authored Oct 10, 2018
  
  3290c83b
- Resolve conflicts in app/assets/javascripts/boards/models/list.js · 2d929fad
  Stan Hu authored Oct 10, 2018
  
  2d929fad
10 Oct, 2018 20 commits
- Merge branch 'update-timeline-icon-for-weights' into 'master' · 6a662c68
  Clement Ho authored Oct 10, 2018
```
Add timeline icon for issue weights

Closes #7121

See merge request gitlab-org/gitlab-ee!7847
```
  6a662c68
- Merge branch '_acet-fix-firefox-weight-input' into 'master' · 23a57022
  Mike Greiling authored Oct 10, 2018
```
Fix disappearing weight input in Firefox

Closes #7887

See merge request gitlab-org/gitlab-ee!7869
```
  23a57022
- Fix disappearing weight input in Firefox · 589f41d6
  Fatih Acet authored Oct 10, 2018
  
  589f41d6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-10 · 7cce2c28
  GitLab Bot authored Oct 10, 2018
```
# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	spec/javascripts/boards/mock_data.js

[ci skip]
```
  7cce2c28
- Merge branch 'prettify-all-the-things-5' into 'master' · 6947890e
  Tim Zallmann authored Oct 10, 2018
```
Prettify all the things (part 5)

See merge request gitlab-org/gitlab-ce!22255
```
  6947890e
- Merge branch 'prettify-all-the-things-2' into 'master' · 20bfbdf2
  Tim Zallmann authored Oct 10, 2018
```
Prettify all the things (part 2)

See merge request gitlab-org/gitlab-ce!22250
```
  20bfbdf2
- Merge branch 'ce-to-ee-2018-10-10' into 'master' · efe49ae6
  Robert Speicher authored Oct 10, 2018
```
CE upstream - 2018-10-10 14:21 UTC

See merge request gitlab-org/gitlab-ee!7865
```
  efe49ae6
- Merge branch... · 2efbc75f
  Clement Ho authored Oct 10, 2018
```
Merge branch '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master'

Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC"

Closes #52103

See merge request gitlab-org/gitlab-ce!22272
```
  2efbc75f
- Merge branch 'mg-update-issue-board-components-ee' into 'master' · 4eaac005
  Fatih Acet authored Oct 10, 2018
```
EE Port of "Convert remaining issue board components into ES module syntax"

See merge request gitlab-org/gitlab-ee!7842
```
  4eaac005
- EE Port of "Convert remaining issue board components into ES module syntax" · 5d0a829d
  Mike Greiling authored Oct 10, 2018
  
  5d0a829d
- Merge branch 'mg-update-issue-board-components' into 'master' · a11919fe
  Fatih Acet authored Oct 10, 2018
```
Convert remaining issue board components into ES module syntax

See merge request gitlab-org/gitlab-ce!22210
```
  a11919fe
- Convert remaining issue board components into ES module syntax · a0189744
  Mike Greiling authored Oct 10, 2018
  
  a0189744
- Remove file extension to force sprockets to inline dropzone css · 9856be6c
  Mike Greiling authored Oct 10, 2018
  
  9856be6c
- Fix merge conflicts for the daily merge · 0d2f5da1
  Zeger-Jan van de Weg authored Oct 10, 2018
```
MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7865
```
  0d2f5da1
- Merge branch 'ml-qa-register-user-failure' into 'master' · 62bd3045
  Rémy Coutable authored Oct 10, 2018
```
QA: Retry registration before failing

See merge request gitlab-org/gitlab-ce!22033
```
  62bd3045
- Merge branch 'ce-quality-nightly-22-fix-uninitialized-constant-QA-Page-Menu-qa' into 'master' · 69ea38dc
  Rémy Coutable authored Oct 10, 2018
```
[QA] Fix a wrong constant name

Closes gitlab-org/quality/nightly#22

See merge request gitlab-org/gitlab-ce!22264
```
  69ea38dc
- Merge branch 'add-allowance-for-feature-flag-after-ff' into 'master' · 39702ce6
  Robert Speicher authored Oct 10, 2018
```
Add allowance to merge feature flags MRs

See merge request gitlab-org/gitlab-ce!22267
```
  39702ce6
- Merge branch 'add-top_upstream_source_sha-in-trigger-build' into 'master' · dbbeec7d
  Rémy Coutable authored Oct 10, 2018
```
Add `TOP_UPSTREAM_SOURCE_SHA` in `scripts/trigger-build`

See merge request gitlab-org/gitlab-ce!22260
```
  dbbeec7d
- Merge branch 'quality-nightly-22-fix-uninitialized-constant-QA-Page-Menu-qa' into 'master' · 27aedd8b
  Rémy Coutable authored Oct 10, 2018
```
[QA] Fix a wrong constant name

Closes gitlab-org/quality/nightly#22

See merge request gitlab-org/gitlab-ee!7863
```
  27aedd8b
- Merge branch 'enhance-deployment-json-schema' into 'master' · b3dfbb8d
  Sean McGivern authored Oct 10, 2018
```
Enhance and test JSON schema for deployments

See merge request gitlab-org/gitlab-ce!22266
```
  b3dfbb8d