Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed locale frontend not picking up regionslocale-region-fix | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
| | | | | | | This was caused by a webpack config issue that would only look in folders that only had lower case letters. This has been changed to include any word character Closes #32913 | ||||
* | Merge branch 'correct-compare_spec-transient' into 'master' | Grzegorz Bizon | 2017-05-25 | 1 | -1/+5 |
|\ | | | | | | | | | Fix transient error clicking dropdown items in compare_spec.rb See merge request !11582 | ||||
| * | Add review comments to compare_spec.rb | Luke "Jared" Bennett | 2017-05-25 | 1 | -0/+2 |
| | | |||||
| * | Fix transient error clicking dropdown items in compare_spec.rb | Luke "Jared" Bennett | 2017-05-25 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'update-helm-source-ip-docs' into 'master' | Achilleas Pipinellis | 2017-05-25 | 1 | -1/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | Add notes to the kubernetes install docs regarding source IPs Closes #32890 See merge request !11697 | ||||
| * | | Add notes to the kubernetes install docs regarding source IPsupdate-helm-source-ip-docs | DJ Mountney | 2017-05-24 | 1 | -1/+35 |
| | | | | | | | | | | | | | | | Note how to add the annotation for preserving the IPs, and note the requirement to run your ingress controllers using a daemonset in GKE. | ||||
* | | | Merge branch 'mrchrisw-add-mr-stats' into 'master' | Achilleas Pipinellis | 2017-05-25 | 2 | -0/+8 |
|\ \ \ | |_|/ |/| | | | | | | | | Add docs on milestone percentage stats See merge request !11428 | ||||
| * | | Add docs on milestone percentage statsmrchrisw-add-mr-stats | Chris Wilson | 2017-05-25 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | Clarify how the milestone percentage is calculated in the docs. Include example image of milestone. | ||||
* | | | Merge branch '32850-award-emoji-off' into 'master' | Phil Hughes | 2017-05-25 | 1 | -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-off | Annabel Dunstone Gray | 2017-05-24 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge branch '32807-company-icon' into 'master' | Phil Hughes | 2017-05-25 | 2 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use briefcase icon for company Closes #32807 See merge request !11692 | ||||
| * | | | | Use briefcase icon for company32807-company-icon | Annabel Dunstone Gray | 2017-05-24 | 2 | -1/+5 |
| |/ / / | |||||
* | | | | Merge branch 'fix-raven-jquery-dep' into 'master' | Phil Hughes | 2017-05-25 | 2 | -19/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use non-global jQuery reference within raven bundle Closes #32662 See merge request !11581 | ||||
| * | | | | Use non-global jQuery reference within raven bundle | Luke "Jared" Bennett | 2017-05-25 | 2 | -19/+2 |
|/ / / / | |||||
* | | | | Merge branch 'feature/rss-scoped-token' into 'master' | Douwe Maan | 2017-05-24 | 38 | -99/+280 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use rss token for atom access See merge request !11647 | ||||
| * | | | | 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 | 5 | -4/+40 |
| | | | | | |||||
| * | | | | remove dead code | Alexis Reigel | 2017-05-24 | 1 | -9/+4 |
| | | | | | |||||
| * | | | | create User#rss_token in user factory explicitely | Alexis Reigel | 2017-05-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we'll have to use `user.reload` in the specs to get the current rss_token value. | ||||
| * | | | | ensure rss token on read | Alexis Reigel | 2017-05-24 | 2 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | we do this on attribute read since migrating all existing users is not a feasible solution. | ||||
| * | | | | use full caps RSS instead of rss | Alexis Reigel | 2017-05-24 | 20 | -48/+48 |
| | | | | | |||||
| * | | | | add changelog | Alexis Reigel | 2017-05-24 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | atom links with rss token instead of private token | Alexis Reigel | 2017-05-24 | 23 | -72/+162 |
| | | | | | |||||
| * | | | | add missing spec for incoming email token presence | Alexis Reigel | 2017-05-24 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | rake task to reset all rss tokens | Alexis Reigel | 2017-05-24 | 2 | -0/+16 |
| | | | | | |||||
| * | | | | add rss_token attribute to user model | Alexis Reigel | 2017-05-24 | 5 | -2/+32 |
| | | | | | |||||
* | | | | | Merge branch '32799-remove-no_turbolink-attribute-from-haml' into 'master' | Robert Speicher | 2017-05-24 | 4 | -7/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant data-turbolink attributes from links Closes #32799 See merge request !11672 | ||||
| * | | | | Remove redundant data-turbolink attributes from links | blackst0ne | 2017-05-25 | 4 | -7/+11 |
|/ / / / | |||||
* | | | | Merge branch 'winh-ajax-filter-cache' into 'master' | Clement Ho | 2017-05-24 | 1 | -36/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab AjaxFilter See merge request !11643 | ||||
| * | | | | Use AjaxCache in Droplab AjaxFilterwinh-ajax-filter-cache | winh | 2017-05-24 | 1 | -36/+11 |
| | | | | | |||||
* | | | | | Merge branch 'dm-copy-gfm-when-parts-of-other-elements-are-selected' into ↵ | Filipa Lacerda | 2017-05-24 | 4 | -8/+45 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | 'master' Copy as GFM even when parts of other elements are selected See merge request !11521 | ||||
| * | | | | Add spec | Douwe Maan | 2017-05-24 | 1 | -0/+19 |
| | | | | | |||||
| * | | | | Copy as GFM even when parts of other elements are selected | Douwe Maan | 2017-05-24 | 3 | -8/+26 |
|/ / / / | |||||
* | | | | Merge branch 'dm-copy-as-gfm-without-empty-elements' into 'master' | Filipa Lacerda | 2017-05-24 | 3 | -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-elements | Douwe Maan | 2017-05-24 | 1 | -3/+1 |
| | | | | |||||
| * | | | Add spec | Douwe Maan | 2017-05-23 | 1 | -0/+13 |
| | | | | |||||
| * | | | Don't copy empty elements that were not selected on purpose as GFM | Douwe Maan | 2017-05-18 | 3 | -29/+55 |
| | | | | |||||
* | | | | Merge branch '32715-fix-note-padding' into 'master' | Annabel Dunstone Gray | 2017-05-24 | 3 | -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-padding | tauriedavis | 2017-05-23 | 4 | -9/+13 |
| | | | | | |||||
* | | | | | Merge branch 'dm-outdated-system-note' into 'master' | Grzegorz Bizon | 2017-05-24 | 33 | -247/+635 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584 | ||||
| * | | | | | Address review | Douwe Maan | 2017-05-24 | 6 | -26/+39 |
| | | | | | | |||||
| * | | | | | Fix specsdm-outdated-system-note | Douwe Maan | 2017-05-23 | 5 | -5/+14 |
| | | | | | | |||||
| * | | | | | Add changelog | Douwe Maan | 2017-05-23 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 27 | -247/+609 |
| | | | | | | |||||
* | | | | | | Merge branch 'github-oauth-self-signed-certs-troubleshooting-docs' into 'master' | Robert Speicher | 2017-05-24 | 1 | -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-docs | Cindy Pallares | 2017-05-23 | 1 | -8/+13 |
| | | | | | | | |||||
* | | | | | | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 5 | -1/+26 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434 | ||||
| * | | | | | | | add loading spinner to sidebar assignees32170-assignees-spinner | Simon Knox | 2017-05-24 | 5 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data | ||||
* | | | | | | | | Merge branch 'patch-19' into 'master' | Achilleas Pipinellis | 2017-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated LFS workflow for removing unreferenced LFS objects See merge request !11108 | ||||
| * | | | | | | | | Updated LFS workflow for removing unreferenced LFS objectspatch-19 | Arihant | 2017-05-05 | 1 | -1/+1 |
| | | | | | | | | |