summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Enable final newline ruleenable-final-newlineAnnabel Dunstone Gray2017-05-261-1/+1
* Set emoji-menu z-index to 200Luke "Jared" Bennett2017-05-261-1/+1
* Resolve "Resolved discussions icon is misaligned"Luke "Jared" Bennett2017-05-261-1/+9
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-2527-229/+177
|\
| * Address feedbackDouwe Maan2017-05-251-4/+2
| * Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| * Remove @commit in compare and MR controllersDouwe Maan2017-05-233-11/+4
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-2314-80/+49
| * Clean up diff renderingDouwe Maan2017-05-2313-134/+121
| * Consistently style image in blob and diffDouwe Maan2017-05-233-3/+2
| * Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-237-32/+32
* | Merge branch 'issue_19262' into 'master'Douwe Maan2017-05-251-2/+13
|\ \
| * | Remove unecessary commit pattern checkFelipe Artur2017-05-251-3/+1
| * | Prevent commits from upstream repositories to be re-processed by forksFelipe Artur2017-05-221-0/+13
* | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-252-3/+6
|\ \ \
| * | | Provide default for calculating label text color (!11681)winh2017-05-252-3/+6
* | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-252-6/+8
|\ \ \ \
| * | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-252-6/+8
* | | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'ma...Annabel Dunstone Gray2017-05-252-3/+8
|\ \ \ \ \
| * | | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diffEric Eastwood2017-05-252-3/+8
* | | | | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-05-251-1/+1
|\ \ \ \ \ \
| * | | | | | Check for filtered-search before constructing filteredsearchmanagerLuke "Jared" Bennett2017-05-121-1/+1
* | | | | | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-05-251-6/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-texttauriedavis2017-05-241-6/+0
* | | | | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-256-18/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-246-18/+22
* | | | | | | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-12/+12
* | | | | | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-2523-76/+418
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Implement web hooks loggingAlexander Randa2017-05-2523-76/+418
* | | | | | | | | | Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-05-251-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix alignment of hover state on emoji button32850-award-emoji-offAnnabel Dunstone Gray2017-05-241-2/+3
* | | | | | | | | | | Merge branch '32807-company-icon' into 'master'Phil Hughes2017-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use briefcase icon for company32807-company-iconAnnabel Dunstone Gray2017-05-241-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Use non-global jQuery reference within raven bundleLuke "Jared" Bennett2017-05-251-1/+2
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'feature/rss-scoped-token' into 'master'Douwe Maan2017-05-246-34/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | extract partialAlexis Reigel2017-05-242-24/+14
| * | | | | | | | | | user can reset his rss token on the account pageAlexis Reigel2017-05-242-4/+20
| * | | | | | | | | | remove dead codeAlexis Reigel2017-05-241-9/+4
| * | | | | | | | | | ensure rss token on readAlexis Reigel2017-05-241-1/+8
| * | | | | | | | | | atom links with rss token instead of private tokenAlexis Reigel2017-05-242-8/+26
| * | | | | | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-1/+2
* | | | | | | | | | | Remove redundant data-turbolink attributes from linksblackst0ne2017-05-253-7/+7
* | | | | | | | | | | Merge branch 'winh-ajax-filter-cache' into 'master'Clement Ho2017-05-241-36/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use AjaxCache in Droplab AjaxFilterwinh-ajax-filter-cachewinh2017-05-241-36/+11
* | | | | | | | | | | Copy as GFM even when parts of other elements are selectedDouwe Maan2017-05-242-8/+22
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master'Filipa Lacerda2017-05-241-26/+49
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unnecessary variabledm-copy-as-gfm-without-empty-elementsDouwe Maan2017-05-241-3/+1
| * | | | | | | | | Don't copy empty elements that were not selected on purpose as GFMDouwe Maan2017-05-181-26/+51
* | | | | | | | | | Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-242-5/+9
|\ \ \ \ \ \ \ \ \ \