Commits · 29731a0321bbbc0f3305579ec32d9ca4a00e5fbd · nexedi / gitlab-ce

13 Dec, 2018 3 commits
- Merge branch 'fixed-diff-notes-not-showing-ce' into 'master' · 29731a03
  Filipa Lacerda authored Dec 13, 2018
```
Fixed notes not being applied to diff lines

Closes #55245 and #55248

See merge request gitlab-org/gitlab-ce!23778
```
  29731a03
- Merge branch '55221-fix-mr-responsive-icons' into 'master' · 0a6c217c
  Phil Hughes authored Dec 13, 2018
```
Fix mr_widget_icon responsive alignment

See merge request gitlab-org/gitlab-ce!23781
```
  0a6c217c
- Fixed parallel discussions throwing an error · 7a5c9f8a
  Phil Hughes authored Dec 13, 2018
  
  7a5c9f8a
12 Dec, 2018 37 commits
- Merge branch 'nurtch' into 'master' · 4d19a84b
  Mike Lewis authored Dec 12, 2018
```
Nurtch link

See merge request gitlab-org/gitlab-ce!23668
```
  4d19a84b
- Fix mr_widget_icon responsive alignment · e5348394
  Paul Slaughter authored Dec 12, 2018
  
  e5348394
- Merge branch 'winh-padding-classes' into 'master' · dd62164d
  Annabel Dunstone Gray authored Dec 12, 2018
```
Add CSS helper classes for left and right padding

See merge request gitlab-org/gitlab-ce!23760
```
  dd62164d
- Merge branch 'update-testing-documentation' into 'master' · 6fa67ebd
  Stan Hu authored Dec 12, 2018
```
Document how to run rspec tests

See merge request gitlab-org/gitlab-ce!23780
```
  6fa67ebd
- changed 'at our [doc]' to 'in our [doc]' · 22d24084
  Mike Lewis authored Dec 12, 2018
  
  22d24084
- Update best_practices.md · 8b7aa1e4
  Sam Bigelow authored Dec 12, 2018
  
  8b7aa1e4
- Document how to run rspec tests · 78cad022
  Sam Bigelow authored Dec 12, 2018
  
  78cad022
- Added test · efbb9501
  Phil Hughes authored Dec 12, 2018
  
  efbb9501
- Fixed notes not being applied to diff lines · 210e90df
  Phil Hughes authored Dec 12, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55248, https://gitlab.com/gitlab-org/gitlab-ce/issues/55245
```
  210e90df
- Add CSS helper classes for left and right padding · e04e22de
  Winnie Hellmann authored Dec 12, 2018
  
  e04e22de
- Merge branch 'database-deprecation-warnings' into 'master' · a9be222f
  Robert Speicher authored Dec 12, 2018
```
Resolve various database deprecation warnings

See merge request gitlab-org/gitlab-ce!23772
```
  a9be222f
- Merge branch 'refactor-create-or-update-import-data' into 'master' · bfe7f7bd
  Robert Speicher authored Dec 12, 2018
```
Refactor Project#create_or_update_import_data

See merge request gitlab-org/gitlab-ce!23701
```
  bfe7f7bd
- Merge branch 'issue_55024' into 'master' · c7ba5c0a
  Nick Thomas authored Dec 12, 2018
```
Do not save user preferences on read-only mode

Closes #55024

See merge request gitlab-org/gitlab-ce!23698
```
  c7ba5c0a
- Do not save user preferences on read-only mode · b80dca82
  Felipe Artur authored Dec 12, 2018
  
  b80dca82
- Fix deprecations in opclasses initializer · 25ea6fdd
  Yorick Peterse authored Dec 12, 2018
```
The use of `table_exists?` in the opclasses support initializer triggers
a deprecation warning. Using `data_source_exists?` removes this
deprecation.
```
  25ea6fdd
- Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs · 2ccd4b36
  Sid Sijbrandij authored Dec 12, 2018
  
  2ccd4b36
- Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs · 5df8a654
  Sid Sijbrandij authored Dec 12, 2018
  
  5df8a654
- Fix ActiveRecord::Migration deprecations · 40ad7d5d
  Yorick Peterse authored Dec 12, 2018
```
Extending from ActiveRecord::Migration is deprecated, but was still used
in a bunch of places.
```
  40ad7d5d
- Meaningful anchor text · 0187980b
  Marcia Ramos authored Dec 12, 2018
```
Ref
https://docs.gitlab.com/ee/development/documentation/styleguide.html#lin
ks
```
  0187980b
- Replace full URL with relative path · 8c669756
  Marcia Ramos authored Dec 12, 2018
  
  8c669756
- Merge branch 'feature/gb/ci-pipeline-bridge' into 'master' · 099777a3
  Kamil Trzciński authored Dec 12, 2018
```
Add basic implementation of CI/CD bridge job

See merge request gitlab-org/gitlab-ce!23730
```
  099777a3
- Merge branch 'qa-mr-wait-for-push' into 'master' · c6db4471
  Nick Thomas authored Dec 12, 2018
```
Wait for push before trying to create a new MR

See merge request gitlab-org/gitlab-ce!23745
```
  c6db4471
- Merge branch 'zj-fix-pool-creation' into 'master' · 460eb38c
  Nick Thomas authored Dec 12, 2018
```
Fix creation query for pools repository

See merge request gitlab-org/gitlab-ce!23729
```
  460eb38c
- Fix creation query for pools repository · 9abb9800
  Zeger-Jan van de Weg authored Dec 12, 2018
  
  9abb9800
- Merge branch '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' · b9ccf013
  Nick Thomas authored Dec 12, 2018
```
Send a notification email on mirror update errors

Closes #54650

See merge request gitlab-org/gitlab-ce!23595
```
  b9ccf013
- Merge branch 'docs/update-automatic-merge-documentation' into 'master' · 5ee900ee
  Marcia Ramos authored Dec 12, 2018
```
Update automatic merging documentation

See merge request gitlab-org/gitlab-ce!23689
```
  5ee900ee
- Merge branch 'lock-sass-3.5' into 'master' · be449047
  Stan Hu authored Dec 12, 2018
```
Specify sass ~> 3.5 in Gemfile

See merge request gitlab-org/gitlab-ce!23716
```
  be449047
- Merge branch 'patch-35' into 'master' · 85102b59
  Marcia Ramos authored Dec 12, 2018
```
Docs: Add spaces before code snippets in vuex.md

See merge request gitlab-org/gitlab-ce!23737
```
  85102b59
- Merge branch 'issue_55133' into 'master' · 4dfe7178
  Sean McGivern authored Dec 12, 2018
```
Fix issuables sort direction button parameters

Closes #55133

See merge request gitlab-org/gitlab-ce!23744
```
  4dfe7178
- Simplify CI/CD bridge class · 4f2685fb
  Grzegorz Bizon authored Dec 12, 2018
  
  4f2685fb
- Specify sass ~> 3.5 in Gemfile · 060eccc7
  Pirate Praveen authored Dec 11, 2018
  
  060eccc7
- Merge branch 'patch-35' into 'master' · b42b53c1
  Achilleas Pipinellis authored Dec 12, 2018
```
Documentation: Content corrections for reCAPTCHA docs

See merge request gitlab-org/gitlab-ce!23667
```
  b42b53c1
- Merge branch 'docs-add-fork-mr-clarification' into 'master' · e462e234
  Achilleas Pipinellis authored Dec 12, 2018
```
add information about how merge requests related to forks are processed

See merge request gitlab-org/gitlab-ce!23764
```
  e462e234
- Merge branch 'tatkins-installation-method-docs' into 'master' · a380bf1f
  Achilleas Pipinellis authored Dec 12, 2018
```
Add docs to help choose the best GitLab installation method

Closes #54308

See merge request gitlab-org/gitlab-ce!23254
```
  a380bf1f
- Merge branch 'docs/ci-yaml-table-links' into 'master' · 9d609753
  Achilleas Pipinellis authored Dec 12, 2018
```
Add hyperlinks to ci yaml documentation

See merge request gitlab-org/gitlab-ce!23674
```
  9d609753
- Merge branch 'patch-35' into 'master' · 616f351b
  Achilleas Pipinellis authored Dec 12, 2018
```
Update README.md

See merge request gitlab-org/gitlab-ce!23672
```
  616f351b
- Merge branch 'docs-update-rack-attack' into 'master' · 7306f7af
  Achilleas Pipinellis authored Dec 12, 2018
```
Remove incorrect example Rack Attack configuration

Closes #54983

See merge request gitlab-org/gitlab-ce!23742
```
  7306f7af