delta/gitlab/gitlab-ce.git/app/controllers, branch notes_fix

Fix for Emoji

2015-11-20T09:13:43+00:00

Merge branch 'ci-yaml-validation' into 'master'

2015-11-19T22:57:06+00:00


Commits without .gitlab-ci.yml are marked as skipped

- Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax

This also fixes: #3521 #3546 

/cc @jacobvosmaer 


See merge request !1827

Merge branch 'emoji_votes' into 'master'

2015-11-19T21:34:38+00:00


Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825

Don't rescue Exception, but StandardError

2015-11-19T19:17:17+00:00

Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' into 'master'

2015-11-19T17:22:20+00:00


Improve personal snippet access workflow.

Replaces !1709

Fixes #3258

See merge request !1817

Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'

2015-11-19T16:45:45+00:00


Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820

adressing comments

2015-11-19T16:12:17+00:00

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-19T10:05:53+00:00


Improve performance of user profiles, finding groups, and finding projects

This MR improves the following:

* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)

Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.

See merge request !1790

satisfy rubocop

2015-11-18T23:31:15+00:00

Emoji: fix image of emoji when it is submitted via comment

2015-11-18T23:26:00+00:00