1. 29 Jan, 2016 5 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-transient-capybara-timeout' into 'master' · f5860ce6
      Dmitriy Zaporozhets authored
      Prevent transient Capybara timeouts during feature tests
      
      The problem occurred because asset compilation takes a long time, so
      when the asset cache didn't exist and the first test ran, it would often
      (randomly) time out during the generation before the actual test even
      had a chance to run.
      
      Now we check if the cache exists before the suite runs, and if not, we
      manually fire a request to the root URL in order to generate it. This
      should allow subsequent tests to use the cached assets.
      
      See merge request !2646
      f5860ce6
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' · 74e1add2
      Dmitriy Zaporozhets authored
      Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""
      
      This reverts commit b0145d76.
      
      See merge request !2642
      74e1add2
    • Marin Jankovski's avatar
      Merge branch 'hotfix/ruby-21-broken-update' into 'master' · 9d0065f0
      Marin Jankovski authored
      fix syntax error on 2.1 and rubocop on 2.2
      
      Background:
      
      Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 
      
      We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.
      
      Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 
      
      Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801
      
      See merge request !2637
      9d0065f0
    • Robert Speicher's avatar
      Prevent transient Capybara timeouts during feature tests · bbe0fa91
      Robert Speicher authored
      The problem occurred because asset compilation takes a long time, so
      when the asset cache didn't exist and the first test ran, it would often
      (randomly) time out during the generation before the actual test even
      had a chance to run.
      
      Now we check if the cache exists before the suite runs, and if not, we
      manually fire a request to the root URL in order to generate it. This
      should allow subsequent tests to use the cached assets.
      bbe0fa91
    • Sytse Sijbrandij's avatar
      92c04ecb
  2. 28 Jan, 2016 26 commits
  3. 27 Jan, 2016 9 commits