Commits · a92b50750cbddd4b2aaa209b181aea06f292f085 · nexedi / gitlab-ce

16 Mar, 2018 25 commits
- fixed scss-lint · a92b5075
  Phil Hughes authored Mar 12, 2018
```
added pointer cursor to diff overview
```
  a92b5075
- change editor when opening file from sidebar · 431de5a6
  Phil Hughes authored Mar 09, 2018
  
  431de5a6
- fixed SCSS-lint · 6f892d41
  Phil Hughes authored Mar 09, 2018
  
  6f892d41
- added border to overview · e00c672e
  Phil Hughes authored Mar 09, 2018
```
hide viewport display
```
  e00c672e
- change background of diff overview · 05a9623a
  Phil Hughes authored Mar 09, 2018
```
fix content not resetting when discarded
```
  05a9623a
- remove hacky margin added to hide diff overview · b40e2c7d
  Phil Hughes authored Mar 09, 2018
```
added comment re. try/catch in dispose
```
  b40e2c7d
- disable scroll past end for diff editor · c463cfd9
  Phil Hughes authored Mar 09, 2018
```
hide diff overview in diff editor
```
  c463cfd9
- fixed editor component spec · bbd52bc7
  Phil Hughes authored Mar 08, 2018
  
  bbd52bc7
- add border around editor mode dropdown container · df47b6b0
  Phil Hughes authored Mar 08, 2018
  
  df47b6b0
- fixed up editor spec by catching any thrown errors · a677fbaf
  Phil Hughes authored Mar 08, 2018
  
  a677fbaf
- change button style when there are changes · e64b93cc
  Phil Hughes authored Mar 07, 2018
  
  e64b93cc
- editor & vuex specs · 60c9c24e
  Phil Hughes authored Mar 07, 2018
  
  60c9c24e
- moved dropdown into new component · cdc467e8
  Phil Hughes authored Mar 07, 2018
```
update dropdown icon
make clearing the editor more performant
```
  cdc467e8
- IDE open changed files in diff viewer · d5138d6a
  Phil Hughes authored Mar 01, 2018
```
Closes #4568
```
  d5138d6a
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · 5ea0fbfc
  James Lopez authored Mar 16, 2018
```
CE upstream - 2018-03-16 09:25 UTC

See merge request gitlab-org/gitlab-ee!4996
```
  5ea0fbfc
- Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning-ee' into 'master' · 6e89fae6
  Achilleas Pipinellis authored Mar 16, 2018
```
Rename SAST for Docker to Container Scanning in EE documentation

See merge request gitlab-org/gitlab-ee!4981
```
  6e89fae6
- Rename SAST for Docker to Container Scanning in EE documentation · df5802d7
  Olivier Gonzalez authored Mar 16, 2018
  
  df5802d7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · 9ea96cbf
  GitLab Bot authored Mar 16, 2018
  
  9ea96cbf
- Merge branch 'revert-feb95ce3' into 'master' · 3c1dd234
  Grzegorz Bizon authored Mar 16, 2018
```
Revert "Merge branch 'update-httparty' into 'master'"

See merge request gitlab-org/gitlab-ce!17789
```
  3c1dd234
- Merge branch 'ee-adamco/gitlab-ce-move-issue-command' into 'master' · 75690134
  Grzegorz Bizon authored Mar 16, 2018
```
Add slash command for moving an issue

See merge request gitlab-org/gitlab-ee!4979
```
  75690134
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · 0a5876ed
  Stan Hu authored Mar 16, 2018
```
CE upstream - 2018-03-16 06:40 UTC

See merge request gitlab-org/gitlab-ee!4993
```
  0a5876ed
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · d12be953
  GitLab Bot authored Mar 16, 2018
  
  d12be953
- Merge branch 'ce-to-ee-2018-03-15' into 'master' · aceacd63
  Stan Hu authored Mar 16, 2018
```
CE upstream - 2018-03-15 19:01 UTC

Closes #5303

See merge request gitlab-org/gitlab-ee!4986
```
  aceacd63
- Revert "Merge branch 'update-httparty' into 'master'" · 36a70603
  Stan Hu authored Mar 15, 2018
```
This reverts commit feb95ce3, reversing
changes made to 1b1475cb.
```
  36a70603
- Revert "Merge branch 'update-httparty' into 'master'" · 6886f64e
  Stan Hu authored Mar 16, 2018
```
This reverts merge request !17737
```
  6886f64e
15 Mar, 2018 15 commits
- Update CHANGELOG.md for 10.5.5 · 16d92de1
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  16d92de1
- Update CHANGELOG.md for 10.5.5 · e8354564
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  e8354564
- Update CHANGELOG-EE.md for 10.5.5-ee · 30640f58
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  30640f58
- Resolve conflicts in lib/gitlab/slash_commands/command.rb · 12068787
  Stan Hu authored Mar 15, 2018
  
  12068787
- Resolve conflict in app/models/ci/build.rb · 7183fac8
  Stan Hu authored Mar 15, 2018
  
  7183fac8
- Resolve conflicts in Gemfile.lock · 4d8df34a
  Stan Hu authored Mar 15, 2018
  
  4d8df34a
- Merge branch 'remove-unnecessary-ee-project-select' into 'master' · 60ee289c
  Fatih Acet authored Mar 15, 2018
```
Remove unnecessary ee project select vue file

See merge request gitlab-org/gitlab-ee!4985
```
  60ee289c
- Merge branch 'docs-new-fe-guide-style' into 'master' · 618b6dd4
  Jacob Schatz authored Mar 15, 2018
```
Rename style to style guide in new frontend guide

See merge request gitlab-org/gitlab-ce!17725
```
  618b6dd4
- Rename style to style guide in new frontend guide · 4161e1f1
  Clement Ho authored Mar 15, 2018
  
  4161e1f1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-15 · b86b8bc0
  GitLab Bot authored Mar 15, 2018
```
# Conflicts:
#	Gemfile.lock
#	app/models/ci/build.rb
#	lib/gitlab/slash_commands/command.rb

[ci skip]
```
  b86b8bc0
- Remove unnecessary ee project select vue file · f05a12c1
  Clement Ho authored Mar 15, 2018
  
  f05a12c1
- Merge branch 'ce-to-ee-2018-03-14' into 'master' · 603ac55e
  Stan Hu authored Mar 15, 2018
```
CE upstream - 2018-03-14 12:24 UTC

See merge request gitlab-org/gitlab-ee!4967
```
  603ac55e
- Merge branch 'fix-import-helper-spec' into 'master' · be52e4bb
  Stan Hu authored Mar 15, 2018
```
Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

See merge request gitlab-org/gitlab-ce!17776
```
  be52e4bb
- Merge branch 'fix-import-helper-spec' into 'master' · 770ba383
  Stan Hu authored Mar 15, 2018
```
Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

See merge request gitlab-org/gitlab-ce!17776
```
  770ba383
- Merge branch 'jivl-realtime-update-adding-file' into 'master' · 3e20b83b
  Phil Hughes authored Mar 15, 2018
```
Add realtime pipeline status component for files

Closes #42927

See merge request gitlab-org/gitlab-ce!17705
```
  3e20b83b