Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add hover-state for emoji in emoji-pickerimprove_emoji | Valery Sizov | 2015-12-11 | 1 | -1/+20 |
* | Fix award-emojis alert flash message | Grzegorz Bizon | 2015-12-11 | 3 | -13/+3 |
* | emoji aliases problem | Valery Sizov | 2015-12-11 | 3 | -3/+10 |
* | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 1 | -2/+18 |
|\ | |||||
| * | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 462 | -3492/+5768 |
| |\ | |||||
| * | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 1 | -7/+15 |
| * | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 376 | -2354/+3977 |
| |\ \ | |||||
| * | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 1 | -1/+5 |
| * | | | Prefer Licence over Copying | Zeger-Jan van de Weg | 2015-10-14 | 1 | -3/+7 |
| * | | | COPYING is now also accepted as licence file | Zeger-Jan van de Weg | 2015-10-14 | 1 | -3/+3 |
* | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove check icon from merged requestsremove_check_icon_from_mr_page | Achilleas Pipinellis | 2015-12-10 | 1 | -1/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | Provide better diagnostic message upon project creation errors | Stan Hu | 2015-12-09 | 1 | -2/+4 |
* | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 2 | -8/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Make selectors more specific when scroll to element | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -1/+1 |
| * | | | | | Make selectors more specific when setting the tab content | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+3 |
| * | | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+2 |
| * | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-09 | 5 | -20/+26 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Ensure new notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -3/+7 |
| * | | | | | Ensure existing notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -1/+3 |
| * | | | | | Ensure notes are replaced on a merge request diff when they're updated | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -1/+1 |
* | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' | Douwe Maan | 2015-12-10 | 21 | -72/+68 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching | Douwe Maan | 2015-12-10 | 63 | -326/+696 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' | Robert Speicher | 2015-12-08 | 21 | -72/+68 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching | Douwe Maan | 2015-12-08 | 28 | -91/+242 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-07 | 165 | -912/+1270 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-03 | 75 | -299/+291 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-02 | 117 | -678/+1242 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-11-19 | 297 | -1737/+3012 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | gfm is no longer | Douwe Maan | 2015-10-27 | 1 | -1/+1 |
| | * | | | | | | | | | | | Reset memoized project repository when path changes | Douwe Maan | 2015-10-27 | 2 | -2/+3 |
| | * | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-27 | 73 | -355/+522 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Use single_line Markdown pipeline for commit description | Douwe Maan | 2015-10-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Use faster, more appropriate pipeline for mentionable attributes | Douwe Maan | 2015-10-22 | 2 | -2/+2 |
| | * | | | | | | | | | | | | Use markdown with gfm pipeline rather than gfm method | Douwe Maan | 2015-10-22 | 2 | -2/+2 |
| | * | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-21 | 187 | -1317/+2000 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Remove stray conflict marker | Douwe Maan | 2015-10-15 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-14 | 22 | -124/+150 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Cache rendered contents of issues, MRs and notes | Douwe Maan | 2015-10-14 | 6 | -20/+30 |
| | * | | | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-14 | 172 | -1477/+1766 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines | Douwe Maan | 2015-10-14 | 1 | -6/+9 |
| | * | | | | | | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methods | Douwe Maan | 2015-10-14 | 9 | -36/+19 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs-snippets-clipboard' | Douwe Maan | 2015-12-10 | 4 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboard | Robert Speicher | 2015-12-09 | 4 | -6/+13 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'devise_paranoid_mode' into 'master' | Robert Speicher | 2015-12-10 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Use devise paranoid mode and ensure the same message is returned every time | Drew Blessing | 2015-12-09 | 1 | -2/+4 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'ui-fix' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -19/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |