summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add hover-state for emoji in emoji-pickerimprove_emojiValery Sizov2015-12-111-1/+20
* Fix award-emojis alert flash messageGrzegorz Bizon2015-12-113-13/+3
* emoji aliases problemValery Sizov2015-12-113-3/+10
* Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-2/+18
|\
| * Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-10462-3492/+5768
| |\
| * | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-7/+15
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-11376-2354/+3977
| |\ \
| * | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-1/+5
| * | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-141-3/+3
* | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' Dmitriy Zaporozhets2015-12-111-1/+0
|\ \ \ \
| * | | | Remove check icon from merged requestsremove_check_icon_from_mr_pageAchilleas Pipinellis2015-12-101-1/+0
| | |_|/ | |/| |
* | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu...Dmitriy Zaporozhets2015-12-101-2/+4
|\ \ \ \
| * | | | Provide better diagnostic message upon project creation errorsStan Hu2015-12-091-2/+4
* | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-102-8/+13
|\ \ \ \ \
| * | | | | Make selectors more specific when scroll to elementDouglas Barbosa Alexandre2015-12-101-1/+1
| * | | | | Make selectors more specific when setting the tab contentDouglas Barbosa Alexandre2015-12-101-3/+3
| * | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-3/+2
| * | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-095-20/+26
| |\ \ \ \ \ | | |/ / / /
| * | | | | Ensure new notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-3/+7
| * | | | | Ensure existing notes are highlighted properly on a merge request diffDouglas Barbosa Alexandre2015-12-091-1/+3
| * | | | | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-1/+1
* | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-101-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-1/+1
* | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' Douwe Maan2015-12-1021-72/+68
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1063-326/+696
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0821-72/+68
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0828-91/+242
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-07165-912/+1270
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0375-299/+291
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-02117-678/+1242
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-19297-1737/+3012
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | gfm is no longerDouwe Maan2015-10-271-1/+1
| | * | | | | | | | | | | Reset memoized project repository when path changesDouwe Maan2015-10-272-2/+3
| | * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2773-355/+522
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use single_line Markdown pipeline for commit descriptionDouwe Maan2015-10-231-1/+1
| | * | | | | | | | | | | | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-222-2/+2
| | * | | | | | | | | | | | Use markdown with gfm pipeline rather than gfm methodDouwe Maan2015-10-222-2/+2
| | * | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-21187-1317/+2000
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Remove stray conflict markerDouwe Maan2015-10-151-1/+0
| | * | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1422-124/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-146-20/+30
| | * | | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-14172-1477/+1766
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-141-6/+9
| | * | | | | | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-149-36/+19
* | | | | | | | | | | | | | | | | Merge branch 'rs-snippets-clipboard'Douwe Maan2015-12-104-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboardRobert Speicher2015-12-094-6/+13
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-101-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-2/+4
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ui-fix' into 'master' Dmitriy Zaporozhets2015-12-101-19/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \