1. 04 Sep, 2016 4 commits
    • Airat Shigapov's avatar
    • Achilleas Pipinellis's avatar
      Merge branch 'zj-add-link-docs-index' into 'master' · beb0b666
      Achilleas Pipinellis authored
      Add link on API docs index page
      
      
      
      See merge request !6190
      beb0b666
    • Stan Hu's avatar
      Merge branch 'fix-spec-failures-diff-spec' into 'master' · 03acf759
      Stan Hu authored
      Fix randomly failing specs in expand_collapse_diff_spec:
      
      This MR fixes the following random failure in a spec:
      
      ```
       Failure/Error: namespace.human_name + ' / ' + name
      
           ActionView::Template::Error:
             undefined method `+' for nil:NilClass
           # ./app/models/project.rb:807:in `name_with_namespace'
           # ./app/views/layouts/project.html.haml:1:in `_app_views_layouts_project_html_haml___2918737809244135908_70160161538920
      '
           # ./app/controllers/projects/commit_controller.rb:23:in `show'
           # ./lib/gitlab/request_profiler/middleware.rb:15:in `call'
           # ./lib/gitlab/middleware/go.rb:16:in `call'
           # ./lib/gitlab/middleware/static.rb:9:in `call'
           # ------------------
      
           # --- Caused by: ---
           # NoMethodError:
           #   undefined method `+' for nil:NilClass
           #   ./app/models/project.rb:807:in `name_with_namespace'
      ```
      
      Capybara's `click_link` method doesn't actually wait for the page to reload.
      When the `expand_all_diffs` parameter is used, we need to search for unique
      elements that appear to ensure that the page has actually reloaded.
      
      Closes #21841
      
      See merge request !6193
      03acf759
    • Stan Hu's avatar
      Fix randomly failing specs in expand_collapse_diff_spec: · 49b9d8ae
      Stan Hu authored
      ```
       Failure/Error: namespace.human_name + ' / ' + name
      
           ActionView::Template::Error:
             undefined method `+' for nil:NilClass
           # ./app/models/project.rb:807:in `name_with_namespace'
           # ./app/views/layouts/project.html.haml:1:in `_app_views_layouts_project_html_haml___2918737809244135908_70160161538920
      '
           # ./app/controllers/projects/commit_controller.rb:23:in `show'
           # ./lib/gitlab/request_profiler/middleware.rb:15:in `call'
           # ./lib/gitlab/middleware/go.rb:16:in `call'
           # ./lib/gitlab/middleware/static.rb:9:in `call'
           # ------------------
      
           # --- Caused by: ---
           # NoMethodError:
           #   undefined method `+' for nil:NilClass
           #   ./app/models/project.rb:807:in `name_with_namespace'
      ```
      
      Capybara's `click_link` method doesn't actually wait for the page to reload.
      When the `expand_all_diffs` parameter is used, we need to search for unique
      elements that appear to ensure that the page has actually reloaded.
      
      Closes #21841
      49b9d8ae
  2. 03 Sep, 2016 1 commit
  3. 02 Sep, 2016 34 commits
  4. 01 Sep, 2016 1 commit