Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/assets/stylesheets/pages/repo.scss

@@ -243,6 +243,10 @@
         width: 100%;
         display: inline-block;
 
+        &:first-child {
+          border-top-left-radius: 2px;
+        }
+
         .title {
           display: inline-block;
           font-size: 10px;

spec/javascripts/repo/components/repo_file_buttons_spec.js

@@ -13,6 +13,10 @@ describe('RepoFileButtons', () => {
     const activeFile = {
       extension: 'md',
       url: 'url',
+      raw_path: 'raw_path',
+      blame_path: 'blame_path',
+      commits_path: 'commits_path',
+      permalink: 'permalink',
     };
     const activeFileLabel = 'activeFileLabel';
     RepoStore.openedFiles = new Array(1);
@@ -27,11 +31,11 @@ describe('RepoFileButtons', () => {
 
     expect(vm.$el.id).toEqual('repo-file-buttons');
     expect(vm.$el.style.borderBottom).toEqual('1px solid rgb(31, 120, 209)');
-    expect(raw.href).toMatch(`/${activeFile.url}`);
+    expect(raw.href).toMatch(`/${activeFile.raw_path}`);
     expect(raw.textContent).toEqual('Raw');
-    expect(blame.href).toMatch(`/${activeFile.url}`);
+    expect(blame.href).toMatch(`/${activeFile.blame_path}`);
     expect(blame.textContent).toEqual('Blame');
-    expect(history.href).toMatch(`/${activeFile.url}`);
+    expect(history.href).toMatch(`/${activeFile.commits_path}`);
     expect(history.textContent).toEqual('History');
     expect(vm.$el.querySelector('.permalink').textContent).toEqual('Permalink');
     expect(vm.$el.querySelector('.preview').textContent).toEqual(activeFileLabel);

spec/javascripts/repo/components/repo_file_options_spec.js

@@ -20,8 +20,6 @@ describe('RepoFileOptions', () => {
 
     expect(vm.$el.classList.contains('repo-file-options')).toBeTruthy();
     expect(vm.$el.querySelector('.title').textContent).toEqual(projectName);
-    expect(vm.$el.querySelector('a[title="New File"]')).toBeTruthy();
-    expect(vm.$el.querySelector('a[title="New Folder"]')).toBeTruthy();
   });
 
   it('does not render if isMini is false', () => {