summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Adds changelog entry32908-edit-commentFilipa Lacerda2017-05-252-41/+2
* Escape note contentFilipa Lacerda2017-05-252-2/+41
* 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-252-1/+5
|\ \
| * | Use briefcase icon for company32807-company-iconAnnabel Dunstone Gray2017-05-242-1/+5
| |/
* | Merge branch 'fix-raven-jquery-dep' into 'master'Phil Hughes2017-05-252-19/+2
|\ \
| * | Use non-global jQuery reference within raven bundleLuke "Jared" Bennett2017-05-252-19/+2
|/ /
* | Merge branch 'feature/rss-scoped-token' into 'master'Douwe Maan2017-05-2438-99/+280
|\ \
| * | extract partialAlexis Reigel2017-05-242-24/+14
| * | user can reset his rss token on the account pageAlexis Reigel2017-05-245-4/+40
| * | remove dead codeAlexis Reigel2017-05-241-9/+4
| * | create User#rss_token in user factory explicitelyAlexis Reigel2017-05-241-0/+4
| * | ensure rss token on readAlexis Reigel2017-05-242-4/+13
| * | use full caps RSS instead of rssAlexis Reigel2017-05-2420-48/+48
| * | add changelogAlexis Reigel2017-05-241-0/+4
| * | atom links with rss token instead of private tokenAlexis Reigel2017-05-2423-72/+162
| * | add missing spec for incoming email token presenceAlexis Reigel2017-05-241-0/+7
| * | rake task to reset all rss tokensAlexis Reigel2017-05-242-0/+16
| * | add rss_token attribute to user modelAlexis Reigel2017-05-245-2/+32
* | | Merge branch '32799-remove-no_turbolink-attribute-from-haml' into 'master'Robert Speicher2017-05-244-7/+11
|\ \ \
| * | | Remove redundant data-turbolink attributes from linksblackst0ne2017-05-254-7/+11
|/ / /
* | | 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
* | | | Merge branch 'dm-copy-gfm-when-parts-of-other-elements-are-selected' into 'ma...Filipa Lacerda2017-05-244-8/+45
|\ \ \ \ | |_|/ / |/| | |
| * | | Add specDouwe Maan2017-05-241-0/+19
| * | | Copy as GFM even when parts of other elements are selectedDouwe Maan2017-05-243-8/+26
|/ / /
* | | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master'Filipa Lacerda2017-05-243-29/+66
|\ \ \ | |_|/ |/| |
| * | Remove unnecessary variabledm-copy-as-gfm-without-empty-elementsDouwe Maan2017-05-241-3/+1
| * | Add specDouwe Maan2017-05-231-0/+13
| * | Don't copy empty elements that were not selected on purpose as GFMDouwe Maan2017-05-183-29/+55
* | | Merge branch '32715-fix-note-padding' into 'master'Annabel Dunstone Gray2017-05-243-5/+13
|\ \ \
| * | | 32715 Make all notes use equal padding32715-fix-note-paddingtauriedavis2017-05-234-9/+13
* | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-2433-247/+635
|\ \ \ \
| * | | | Address reviewDouwe Maan2017-05-246-26/+39
| * | | | Fix specsdm-outdated-system-noteDouwe Maan2017-05-235-5/+14
| * | | | Add changelogDouwe Maan2017-05-231-0/+4
| * | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-2327-247/+609
* | | | | Merge branch 'github-oauth-self-signed-certs-troubleshooting-docs' into 'master'Robert Speicher2017-05-241-8/+13
|\ \ \ \ \
| * | | | | Add extra step in GHE import docsgithub-oauth-self-signed-certs-troubleshooting-docsCindy Pallares2017-05-231-8/+13
* | | | | | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-245-1/+26
|\ \ \ \ \ \
| * | | | | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-245-1/+26
* | | | | | | Merge branch 'patch-19' into 'master'Achilleas Pipinellis2017-05-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Updated LFS workflow for removing unreferenced LFS objectspatch-19Arihant2017-05-051-1/+1
* | | | | | | | Merge branch '32828-refresh-build' into 'master'Phil Hughes2017-05-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use refresh icon for retried jobs32828-refresh-buildAnnabel Dunstone Gray2017-05-231-1/+1
* | | | | | | | | Merge branch 'fix-eslint' into 'master'Tim Zallmann2017-05-242-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use import instead of requirefix-eslintClement Ho2017-05-242-2/+2
* | | | | | | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-2416-434/+635
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-2332-804/+788
View Lorry Controller Status