summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use briefcase icon for company Closes #32807 See merge request !11692
| * | 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
|\ \ | | | | | | | | | | | | 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-242-4/+20
| | |
| * | remove dead codeAlexis Reigel2017-05-241-9/+4
| | |
| * | ensure rss token on readAlexis Reigel2017-05-241-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 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 AjaxFilter See merge request !11643
| * | | 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
|\ \ \ | |_|/ |/| | | | | | | | 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
| | |
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-233-9/+9
| | | |
* | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-2417-59/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584
| * | | | Address reviewDouwe Maan2017-05-242-6/+9
| | | | |
| * | | | Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-2/+5
| | | | |
| * | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-2316-61/+97
| | | | |
* | | | | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-243-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data
* | | | | | 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 'dm-fix-routes' into 'master'Robert Speicher2017-05-242-189/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-22/+18
| | | | | | |
| * | | | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-236-201/+32
| | | | | | |
* | | | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-241-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-requestsOswaldo Ferreira2017-05-221-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'mrchrisw-catch-openssl' into 'master'Douwe Maan2017-05-242-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue OpenSSL::SSL::SSLError in JiraService See merge request !11467
| * | | | | | | | Rescue OpenSSL::SSL::SSLError in JiraService and IssueTrackerServicemrchrisw-catch-opensslChris Wilson2017-05-232-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 notesKushal Pandya2017-05-246-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master'Filipa Lacerda2017-05-242-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-codeDouwe Maan2017-05-231-6/+6
| | | | | | | | | |
| * | | | | | | | | Don't wrap pasted code when it's already inside code tagsDouwe Maan2017-05-192-3/+22
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Reorder Issue action buttons as per UX recommendationKushal Pandya2017-05-241-12/+16
| | | | | | | | |
* | | | | | | | | Merge branch '32700-extra-nav-border' into 'master'Phil Hughes2017-05-241-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-borderAnnabel Dunstone Gray2017-05-231-11/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Phil Hughes2017-05-2412-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-dropdownsClement Ho2017-05-2311-18/+37
| | | | | | | | | | |
| * | | | | | | | | | Remove duplicated codeClement Ho2017-05-183-18/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '32682-skipped-ci-icon' into 'master'Phil Hughes2017-05-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new icon for CI skipped status Closes #32682 See merge request !11606
| * | | | | | | | | | Adds new icon for CI skipped status32682-skipped-ci-iconFilipa Lacerda2017-05-222-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-242-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-releasesLuke "Jared" Bennett2017-05-211-2/+2
| | | | | | | | | | | |