delta/gitlab/gitlab-ce.git, branch 20892-commit-info gitlab.com: gitlab-org/gitlab-ce.git Fix rubocop offenses 2016-10-28T16:14:04+00:00 Annabel Dunstone Gray annabel.dunstone@gmail.com 2016-10-28T16:14:04+00:00 73f697d53bdec63e65bb95c328d69afef7c86e45 






Add commit_box spec
2016-10-28T15:35:46+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-28T15:35:46+00:00

ceaafd3a6e253f6af827b9c9ede37150c3ed3b95












Display last pipeline info
2016-10-28T14:00:30+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-20T13:10:15+00:00

3f979481a1592d274e3b032ce74070f30645a184












Fix commits spec
2016-10-28T14:00:30+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-19T19:02:12+00:00

240b35b130e9391714088c52260e66cb4bfd165e












Fix mobile view
2016-10-28T14:00:30+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-19T15:25:12+00:00

2949f9b453d554bd1d9343df255b47bb3f98d182












Finish styling commits view
2016-10-28T14:00:30+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-19T00:41:29+00:00

002670ec73604feaf1e675ce98157bfb3d5709c9












Rearrange commit info view
2016-10-28T14:00:30+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2016-10-18T23:57:53+00:00

0a848266d7b66b3dce19298337e9ac0b1471db11












Merge branch 'clean-up-issue_spec.js' into 'master'

2016-10-28T13:37:19+00:00

Rémy Coutable
remy@rymai.me

2016-10-28T13:37:19+00:00

2672f44e25b6b2638b850208a1ef4a97983f28ed


Replace static fixture by generated one in issue_spec.js

## What does this MR do?

- clean up `issue_spec.js`
- introduce an alternative approach to #19445
  - rename `rake teaspoon` to `rake teaspoon:tests`
  - introduce `rake teaspoon:fixtures` which generates fixtures using RSpec
  - introduce `rake teaspoon` which runs `rake teaspoon:fixtures` and `rake teaspoon:tests`

## Why was this MR needed?

- many duplications
- missing existence checks
- missing conditions
- static fixtures don't match real views

## Reasoning

I want to explain some of my decisions here, so that they stay visible for future discussions.

### Why not HAML?

- same number of HAML templates as number of fixtures (many input files)
- embedded logic less readable
- can not be rendered by JavaScript (because of inline Ruby)

### Why RSpec?

- real controllers for fixtures
- spys available for mocking
- easily report failed fixture generations

### Why not magic_lamp? (#19445)

- introduces another dependency/tool
- needs to run a server concurrently to teaspoon
- makes it harder to use a JavaScript test runner
- static HTML files serve faster

See merge request !6059





Replace static fixture by generated one in issue_spec.js

## What does this MR do?

- clean up `issue_spec.js`
- introduce an alternative approach to #19445
  - rename `rake teaspoon` to `rake teaspoon:tests`
  - introduce `rake teaspoon:fixtures` which generates fixtures using RSpec
  - introduce `rake teaspoon` which runs `rake teaspoon:fixtures` and `rake teaspoon:tests`

## Why was this MR needed?

- many duplications
- missing existence checks
- missing conditions
- static fixtures don't match real views

## Reasoning

I want to explain some of my decisions here, so that they stay visible for future discussions.

### Why not HAML?

- same number of HAML templates as number of fixtures (many input files)
- embedded logic less readable
- can not be rendered by JavaScript (because of inline Ruby)

### Why RSpec?

- real controllers for fixtures
- spys available for mocking
- easily report failed fixture generations

### Why not magic_lamp? (#19445)

- introduces another dependency/tool
- needs to run a server concurrently to teaspoon
- makes it harder to use a JavaScript test runner
- static HTML files serve faster

See merge request !6059






Merge branch 'fix/make-github-import-retryable' into 'master'

2016-10-28T12:44:32+00:00

Sean McGivern
sean@mcgivern.me.uk

2016-10-28T12:44:32+00:00

4fd015183cdb280083384c69261c2ab5d475a54b


Modify GitHub importer to be retryable

Closes #23533

See merge request !7003





Modify GitHub importer to be retryable

Closes #23533

See merge request !7003






Merge branch '5905-duplicate-email-errors' into 'master'

2016-10-28T12:38:00+00:00

Rémy Coutable
remy@rymai.me

2016-10-28T12:38:00+00:00

04c7c8d8bbc99eaee728c1ca3572b7ae2dc8d2fb


Only show one error message for an invalid email

Changes it to only validate the notification_email format if it's different from email.

Closes #5905

See merge request !7158





Only show one error message for an invalid email

Changes it to only validate the notification_email format if it's different from email.

Closes #5905

See merge request !7158