delta/gitlab/gitlab-ce.git, branch replace-linux-with-gnu-linux

Replace linux with GNU/Linux to recognize the work of Dr. Stallman.

2015-03-16T01:06:25+00:00

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-03-14T23:44:39+00:00

Merge branch 'fix-mr-notes' into 'master'

2015-03-14T20:45:50+00:00

Use pre-wrap for diff code in discussion view

This prevents merge request comments from being hidden in discussion view.  See #2017.

### Before

![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png)

### After

![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png)

This change doesn't affect the "Changes" tab:

![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png)

cc @sytse

See merge request !1700

Use pre-wrap for diff code in discussion view

2015-03-14T18:30:36+00:00

Merge pull request #8955 from wasamasa/fix-deploy.sh-typo

2015-03-14T09:40:05+00:00

Fix typo

Fix typo

2015-03-14T09:22:06+00:00

Merge branch 'more-flatly'

2015-03-14T08:48:13+00:00

Return some merge widget styles and make it more compact

2015-03-14T08:47:19+00:00

Merge branch 'resetyle-import' into 'master'

2015-03-14T08:17:08+00:00

Restyle import

Render import providers in one line and make it buttons

See merge request !1699

Merge branch 'more-flatly' into 'master'

2015-03-14T08:16:38+00:00

More flatly

* use sass variables for repeating colors
* use more of Flatly theme variables
* refactor buttons

See merge request !1698