Jacob Schatz 318b22459b Merge branch 'incremental-fixes' into 'master' ...

Fix concurrent request when updating build log in browser

If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535

See merge request !4183

2016-05-25 11:51:20 +00:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

controllers

Enable Style/SpaceAroundKeyword cop and fix offenses

2016-05-23 14:16:35 -04:00

factories

Create a todo on failing MR build

2016-05-17 10:17:45 +01:00

features

Merge branch 'master' into project-navigation-redesign

2016-05-23 22:41:11 +02:00

finders

Make upcoming milestone work across projects

2016-05-16 10:25:24 +01:00

fixtures

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-20 16:23:04 -05:00

helpers

Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff

2016-05-18 11:15:10 -05:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Dropdown implementation

2016-05-20 15:58:36 -05:00

lib

Replace \n to <br>

2016-05-23 21:59:07 -05:00

mailers

Syntax-highlight diffs in push emails

2016-05-17 13:23:17 +01:00

models

Seconds plural slack

2016-05-24 10:54:16 +02:00

requests

Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value.

2016-05-22 19:50:49 -06:00

routing

Merge branch 'health-check-route'

2016-05-12 16:39:03 -05:00

services

Enable Style/SpaceAroundKeyword cop and fix offenses

2016-05-23 14:16:35 -04:00

support

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-20 16:23:04 -05:00

tasks/gitlab

Fix backups if registry is disabled

2016-05-23 14:18:39 -05:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios

2016-05-19 15:51:41 -05:00

factories_spec.rb

Enable Style/SpaceAroundKeyword cop and fix offenses

2016-05-23 14:16:35 -04:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Update rspec-rails from 3.3.3 to 3.4.2.

2016-05-01 13:44:50 -06:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00