Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Set emoji-menu z-index to 200 | Luke "Jared" Bennett | 2017-05-26 | 1 | -1/+1 |
* | Resolve "Resolved discussions icon is misaligned" | Luke "Jared" Bennett | 2017-05-26 | 1 | -1/+9 |
* | Merge branch 'dm-diff-cleanup' into 'master' | Robert Speicher | 2017-05-25 | 27 | -229/+177 |
|\ | |||||
| * | Address feedback | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| * | Change code comment formattingdm-diff-cleanup | Douwe Maan | 2017-05-23 | 1 | -1/+3 |
| * | Remove @commit in compare and MR controllers | Douwe Maan | 2017-05-23 | 3 | -11/+4 |
| * | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 14 | -80/+49 |
| * | Clean up diff rendering | Douwe Maan | 2017-05-23 | 13 | -134/+121 |
| * | Consistently style image in blob and diff | Douwe Maan | 2017-05-23 | 3 | -3/+2 |
| * | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 7 | -32/+32 |
* | | Merge branch 'issue_19262' into 'master' | Douwe Maan | 2017-05-25 | 1 | -2/+13 |
|\ \ | |||||
| * | | Remove unecessary commit pattern check | Felipe Artur | 2017-05-25 | 1 | -3/+1 |
| * | | Prevent commits from upstream repositories to be re-processed by forks | Felipe Artur | 2017-05-22 | 1 | -0/+13 |
* | | | Merge branch 'winh-label-textcolor-default' into 'master' | Grzegorz Bizon | 2017-05-25 | 2 | -3/+6 |
|\ \ \ | |||||
| * | | | Provide default for calculating label text color (!11681) | winh | 2017-05-25 | 2 | -3/+6 |
* | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' | Douwe Maan | 2017-05-25 | 2 | -6/+8 |
|\ \ \ \ | |||||
| * | | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-language | Ruben Davila | 2017-05-25 | 2 | -6/+8 |
* | | | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'ma... | Annabel Dunstone Gray | 2017-05-25 | 2 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diff | Eric Eastwood | 2017-05-25 | 2 | -3/+8 |
* | | | | | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master' | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Check for filtered-search before constructing filteredsearchmanager | Luke "Jared" Bennett | 2017-05-12 | 1 | -1/+1 |
* | | | | | | | Merge branch 'add-back-margin-to-note-text' into 'master' | Annabel Dunstone Gray | 2017-05-25 | 1 | -6/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-text | tauriedavis | 2017-05-24 | 1 | -6/+0 |
* | | | | | | | | Merge branch 'revert-b0498c17' into 'master' | Robert Speicher | 2017-05-25 | 6 | -18/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "Remove changes that are not absolutely necessary" | Douwe Maan | 2017-05-24 | 6 | -18/+22 |
* | | | | | | | | | Merge branch 'fix-kubernetes-namespace' into 'master' | Grzegorz Bizon | 2017-05-25 | 1 | -12/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix terminals support for Kubernetes service | Kamil Trzcinski | 2017-05-25 | 1 | -12/+12 |
* | | | | | | | | | | Merge branch '17848-web-hook-logging' into 'master' | Dmitriy Zaporozhets | 2017-05-25 | 23 | -76/+418 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Implement web hooks logging | Alexander Randa | 2017-05-25 | 23 | -76/+418 |
* | | | | | | | | | | Merge branch '32850-award-emoji-off' into 'master' | Phil Hughes | 2017-05-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix alignment of hover state on emoji button32850-award-emoji-off | Annabel Dunstone Gray | 2017-05-24 | 1 | -2/+3 |
* | | | | | | | | | | | Merge branch '32807-company-icon' into 'master' | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use briefcase icon for company32807-company-icon | Annabel Dunstone Gray | 2017-05-24 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Use non-global jQuery reference within raven bundle | Luke "Jared" Bennett | 2017-05-25 | 1 | -1/+2 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'feature/rss-scoped-token' into 'master' | Douwe Maan | 2017-05-24 | 6 | -34/+61 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | extract partial | Alexis Reigel | 2017-05-24 | 2 | -24/+14 |
| * | | | | | | | | | | user can reset his rss token on the account page | Alexis Reigel | 2017-05-24 | 2 | -4/+20 |
| * | | | | | | | | | | remove dead code | Alexis Reigel | 2017-05-24 | 1 | -9/+4 |
| * | | | | | | | | | | ensure rss token on read | Alexis Reigel | 2017-05-24 | 1 | -1/+8 |
| * | | | | | | | | | | atom links with rss token instead of private token | Alexis Reigel | 2017-05-24 | 2 | -8/+26 |
| * | | | | | | | | | | add rss_token attribute to user model | Alexis Reigel | 2017-05-24 | 1 | -1/+2 |
* | | | | | | | | | | | Remove redundant data-turbolink attributes from links | blackst0ne | 2017-05-25 | 3 | -7/+7 |
* | | | | | | | | | | | Merge branch 'winh-ajax-filter-cache' into 'master' | Clement Ho | 2017-05-24 | 1 | -36/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Use AjaxCache in Droplab AjaxFilterwinh-ajax-filter-cache | winh | 2017-05-24 | 1 | -36/+11 |
* | | | | | | | | | | | Copy as GFM even when parts of other elements are selected | Douwe Maan | 2017-05-24 | 2 | -8/+22 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master' | Filipa Lacerda | 2017-05-24 | 1 | -26/+49 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove unnecessary variabledm-copy-as-gfm-without-empty-elements | Douwe Maan | 2017-05-24 | 1 | -3/+1 |
| * | | | | | | | | | Don't copy empty elements that were not selected on purpose as GFM | Douwe Maan | 2017-05-18 | 1 | -26/+51 |
* | | | | | | | | | | Merge branch '32715-fix-note-padding' into 'master' | Annabel Dunstone Gray | 2017-05-24 | 2 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 32715 Make all notes use equal padding32715-fix-note-padding | tauriedavis | 2017-05-23 | 3 | -9/+9 |