summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groupsPhil Hughes2017-05-253-1/+36
| | | | Closes #32906
* Merge branch '32850-award-emoji-off' into 'master'Phil Hughes2017-05-251-2/+3
|\ | | | | | | | | | | | | Fix alignment of hover state on emoji button Closes #32850 See merge request !11691
| * 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 company Closes #32807 See merge request !11692
| * | 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 bundle Closes #32662 See merge request !11581
| * | 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
|\ \ | | | | | | | | | | | | Use rss token for atom access See merge request !11647
| * | 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
| | | | | | | | | | | | | | | otherwise we'll have to use `user.reload` in the specs to get the current rss_token value.
| * | ensure rss token on readAlexis Reigel2017-05-242-4/+13
| | | | | | | | | | | | | | | we do this on attribute read since migrating all existing users is not a feasible solution.
| * | 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 links Closes #32799 See merge request !11672
| * | | 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 AjaxFilter See merge request !11643
| * | | 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 ↵Filipa Lacerda2017-05-244-8/+45
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 'master' Copy as GFM even when parts of other elements are selected See merge request !11521
| * | | 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
|\ \ \ | |_|/ |/| | | | | | | | Don't copy empty elements that were not selected on purpose as GFM See merge request !11520
| * | 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 padding Closes #32715 and #32467 See merge request !11616
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve oauth self signed certs troubleshooting docs See merge request !11621
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434
| * | | | | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-245-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data
* | | | | | | Merge branch 'patch-19' into 'master'Achilleas Pipinellis2017-05-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated LFS workflow for removing unreferenced LFS objects See merge request !11108
| * | | | | | | 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 jobs Closes #32828 See merge request !11667
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint errors in master Closes #32862 See merge request !11684
| * | | | | | | | | Use import instead of requirefix-eslintClement Ho2017-05-242-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-2416-434/+635
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
| * | | | | | | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-2332-804/+788
| | | | | | | | | | |
| * | | | | | | | | | Fix specsDouwe Maan2017-05-236-52/+66
| | | | | | | | | | |
View Lorry Controller Status