Commits · 14e21931c856437bb071279e212a3f6820b8e04d · nexedi / gitlab-ce

08 Feb, 2018 18 commits
- Merge branch 'ce-to-ee-2018-02-07' into 'master' · 14e21931
  Marin Jankovski authored Feb 08, 2018
```
CE upstream - 2018-02-07 20:29 UTC

Closes #4813, gitaly#880, gitaly#1000, and gitaly#994

See merge request gitlab-org/gitlab-ee!4434
```
  14e21931
- Merge branch 'ee-ide-close-changed-files' into 'master' · e02a6804
  Tim Zallmann authored Feb 08, 2018
```
Added changed state to IDE

Closes #4540

See merge request gitlab-org/gitlab-ee!4429
```
  e02a6804
- Merge branch 'docs/add-jira-sso-captcha-notes' into 'master' · 7a8194bc
  Achilleas Pipinellis authored Feb 08, 2018
```
Add SSO and CAPTCHA notes to JIRA docs

See merge request gitlab-org/gitlab-ee!4332
```
  7a8194bc
- Remove newlines, indent note under list · 9ffa9552
  Achilleas Pipinellis authored Feb 08, 2018
  
  9ffa9552
- fixed failing specs · 5b2574d0
  Phil Hughes authored Feb 08, 2018
```
added more specs
```
  5b2574d0
- EE port of ide-close-changed-files · c194d4ac
  Phil Hughes authored Feb 07, 2018
  
  c194d4ac
- Fix docs conflicts · e79767a8
  Achilleas Pipinellis authored Feb 08, 2018
  
  e79767a8
- Resolving conflict with doc/api/search.md · 22de3a65
  Ian Baum authored Feb 07, 2018
  
  22de3a65
- Merge branch 'ee-internationalize-graph-page' into 'master' · bdbb6942
  Clement Ho authored Feb 08, 2018
```
Annotate graph page for internationalization

See merge request gitlab-org/gitlab-ee!4438
```
  bdbb6942
- Annotate graph page for internationalization · 0bd3684c
  Shah El-Rahman authored Feb 08, 2018
  
  0bd3684c
- Fixing bad resolution to db/schema.rb · 28878f71
  Ian Baum authored Feb 07, 2018
  
  28878f71
- Fixing bad resolution to db/schema.rb · 934cbead
  Ian Baum authored Feb 07, 2018
  
  934cbead
- Merge branch '4734-warning-about-un-replicated-data-in-dr-failover-docs' into 'master' · 7549731a
  Stan Hu authored Feb 08, 2018
```
Resolve "Warning about un-replicated data in DR failover"

See merge request gitlab-org/gitlab-ee!4343
```
  7549731a
- Move warning into second block about recovery · 825f7de0
  Stan Hu authored Feb 07, 2018
  
  825f7de0
- Remove documentation CHANGELOG entry · bad8406a
  Stan Hu authored Feb 07, 2018
  
  bad8406a
- Merge branch 'master' into 4734-warning-about-un-replicated-data-in-dr-failover-docs · 874cbe75
  Stan Hu authored Feb 07, 2018
  
  874cbe75
- Merge branch 'add-support-metrics-smaller' into 'master' · fdbac6f6
  Clement Ho authored Feb 08, 2018
```
Support metrics where smaller is better

Closes #4367

See merge request gitlab-org/gitlab-ee!3891
```
  fdbac6f6
- Support metrics where smaller is better · 1f14b4d9
  Joshua Lambert authored Feb 08, 2018
  
  1f14b4d9
07 Feb, 2018 22 commits
- Resolving conflict with app/assets/javascripts/pages/search/init_filtered_search.js · a8fdd336
  Ian Baum authored Feb 07, 2018
  
  a8fdd336
- Resolving conflict with doc/user/group/index.md · 82a50a06
  Ian Baum authored Feb 07, 2018
  
  82a50a06
- Resolving conflict with doc/administration/job_artifacts.md · b603d0c5
  Ian Baum authored Feb 07, 2018
  
  b603d0c5
- Resolving conflict with doc/user/project/merge_requests/index.md · 970d489f
  Ian Baum authored Feb 07, 2018
  
  970d489f
- Resolving conflict with doc/user/project/issues/index.md · 32ca982a
  Ian Baum authored Feb 07, 2018
  
  32ca982a
- Resolving conflict with doc/user/project/issue_board.md · 923fe4d1
  Ian Baum authored Feb 07, 2018
  
  923fe4d1
- Resolving conflict with doc/user/permissions.md · 2b375642
  Ian Baum authored Feb 07, 2018
  
  2b375642
- Resolving conflict with doc/topics/autodevops/index.md · 09e4c617
  Ian Baum authored Feb 07, 2018
  
  09e4c617
- Resolving conflict with doc/ci/variables/README.md · e93e0ae3
  Ian Baum authored Feb 07, 2018
  
  e93e0ae3
- Resolving conflict with doc/ci/examples/browser_performance.md · 00778036
  Ian Baum authored Feb 07, 2018
  
  00778036
- Resolving conflict with lib/api/search.rb · 504608d1
  Ian Baum authored Feb 07, 2018
  
  504608d1
- Merge branch 'expired-ci-artifacts-ee2' into 'master' · 29c23e4b
  Stan Hu authored Feb 07, 2018
```
Move code to EE model to avoid conflicts on pending performance MR

See merge request gitlab-org/gitlab-ee!4423
```
  29c23e4b
- Fix ci/pipeline and doc/user/project/index doc · 2df798a7
  Mayra Cabrera authored Feb 07, 2018
  
  2df798a7
- Merge remote-tracking branch 'dev/master' · ce010e24
  Stan Hu authored Feb 07, 2018
  
  ce010e24
- Resolving conflict with db/schema.rb · 3d9d3eb4
  Ian Baum authored Feb 07, 2018
  
  3d9d3eb4
- Resolving conflict with app/models/ci/pipeline.rb · fde1a9c0
  Ian Baum authored Feb 07, 2018
  
  fde1a9c0
- Resolving conflict with... · 6d16a164
  Ian Baum authored Feb 07, 2018
```
Resolving conflict with spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
```
  6d16a164
- Resolving conflict with locale/gitlab.pot · 4cfc7d30
  Ian Baum authored Feb 07, 2018
  
  4cfc7d30
- Resolving conflict with spec/lib/gitlab/import_export/all_models.yml · cbfc167e
  Ian Baum authored Feb 07, 2018
  
  cbfc167e
- Resolving conflict with spec/services/lfs/lock_file_service_spec.rb · 86ca3179
  Ian Baum authored Feb 07, 2018
  
  86ca3179
- Resolving conflict with spec/services/lfs/unlock_file_service_spec.rb · ae906300
  Ian Baum authored Feb 07, 2018
  
  ae906300
- Merge branch 'ce-to-ee-2018-02-07' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2018-02-07 · a20115c6
  Ian Baum authored Feb 07, 2018
  
  a20115c6