Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Use briefcase icon for company Closes #32807 See merge request !11692 | ||||
| * | | 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 |
|\ \ | | | | | | | | | | | | | 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 | 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 |
| | | | | | | | | | | | | | | | we do this on attribute read since migrating all existing users is not a feasible solution. | ||||
| * | | 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 AjaxFilter See merge request !11643 | ||||
| * | | | 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 |
|\ \ \ | |_|/ |/| | | | | | | | | 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 |
| | | | |||||
| * | | 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 padding Closes #32715 and #32467 See merge request !11616 | ||||
| * | | | 32715 Make all notes use equal padding32715-fix-note-padding | tauriedavis | 2017-05-23 | 3 | -9/+9 |
| | | | | |||||
* | | | | Merge branch 'dm-outdated-system-note' into 'master' | Grzegorz Bizon | 2017-05-24 | 17 | -59/+101 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+9 |
| | | | | | |||||
| * | | | | Fix specsdm-outdated-system-note | Douwe Maan | 2017-05-23 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 16 | -61/+97 |
| | | | | | |||||
* | | | | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 3 | -1/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data | ||||
* | | | | | | Merge branch '32828-refresh-build' into 'master' | Phil Hughes | 2017-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use refresh icon for retried jobs Closes #32828 See merge request !11667 | ||||
| * | | | | | | Use refresh icon for retried jobs32828-refresh-build | Annabel Dunstone Gray | 2017-05-23 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'dm-fix-routes' into 'master' | Robert Speicher | 2017-05-24 | 2 | -189/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570 | ||||
| * | | | | | | Remove changes that are not absolutely necessarydm-fix-routes | Douwe Maan | 2017-05-23 | 6 | -22/+18 |
| | | | | | | | |||||
| * | | | | | | Fix ambiguous routing issues by teaching router about reserved words | Douwe Maan | 2017-05-23 | 6 | -201/+32 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master' | Douwe Maan | 2017-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wait_for_requests for checking Vue resource and $.ajax requests [CE] Closes #31946 and #31555 See merge request !11451 | ||||
| * | | | | | | | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requests | Oswaldo Ferreira | 2017-05-22 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'mrchrisw-catch-openssl' into 'master' | Douwe Maan | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue OpenSSL::SSL::SSLError in JiraService See merge request !11467 | ||||
| * | | | | | | | | Rescue OpenSSL::SSL::SSLError in JiraService and IssueTrackerServicemrchrisw-catch-openssl | Chris Wilson | 2017-05-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OpenSSL::SSL::SSLError to rescue in JiraService & IssueTrackerService. This will prevent an exception in production and instead display a message to the user. | ||||
* | | | | | | | | | Fix user and issues autocomplete in diff notes | Kushal Pandya | 2017-05-24 | 6 | -6/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master' | Filipa Lacerda | 2017-05-24 | 2 | -9/+28 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't wrap pasted code when it's already inside code tags Closes #32507 See merge request !11524 | ||||
| * | | | | | | | | | Add specdm-paste-code-inside-gfm-code | Douwe Maan | 2017-05-23 | 1 | -6/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Don't wrap pasted code when it's already inside code tags | Douwe Maan | 2017-05-19 | 2 | -3/+22 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Reorder Issue action buttons as per UX recommendation | Kushal Pandya | 2017-05-24 | 1 | -12/+16 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '32700-extra-nav-border' into 'master' | Phil Hughes | 2017-05-24 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show extra nav border on layout nav Closes #32700 See merge request !11657 | ||||
| * | | | | | | | | | Only show extra nav border on layout nav32700-extra-nav-border | Annabel Dunstone Gray | 2017-05-23 | 1 | -11/+11 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch ↵ | Phil Hughes | 2017-05-24 | 12 | -36/+52 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master' Resolve "Remove duplicated config code for filtered search dropdowns" Closes #32563 See merge request !11512 | ||||
| * | | | | | | | | | | Port EE changes32563-remove-duplicated-config-code-for-filtered-search-dropdowns | Clement Ho | 2017-05-23 | 11 | -18/+37 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove duplicated code | Clement Ho | 2017-05-18 | 3 | -18/+15 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '32682-skipped-ci-icon' into 'master' | Phil Hughes | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new icon for CI skipped status Closes #32682 See merge request !11606 | ||||
| * | | | | | | | | | | Adds new icon for CI skipped status32682-skipped-ci-icon | Filipa Lacerda | 2017-05-22 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sentry-clientside-releases' into 'master' | Phil Hughes | 2017-05-24 | 2 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565 | ||||
| * | | | | | | | | | | | Use Gitlab::REVISION over reading HEAD sha from gitsentry-clientside-releases | Luke "Jared" Bennett | 2017-05-21 | 1 | -2/+2 |
| | | | | | | | | | | | |