Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'back-port-locked-milestones-to-ce' into 'master' | Phil Hughes | 2017-05-30 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | `canEdit` changes for conditional remove button on filtered search -- EE backport Closes gitlab-ee#2433 See merge request !11696 | ||||
| * | Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ce | Eric Eastwood | 2017-05-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Fix locked milestone in boards being remove-able. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963 Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433 Conflicts: app/assets/javascripts/boards/boards_bundle.js app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/filtered_search/filtered_search_manager.js spec/features/boards/boards_spec.rb | ||||
* | | Merge branch ↵ | Fatih Acet | 2017-05-30 | 1 | -0/+37 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734 | ||||
| * | | Added specs for handleNotifications in mr_widget_options_spec.js | Luke "Jared" Bennett | 2017-05-26 | 1 | -0/+37 |
| |/ | |||||
* | | Update looks job log | Filipa Lacerda | 2017-05-30 | 1 | -130/+176 |
| | | |||||
* | | Merge branch '31349-pipeline-url-techdeb' into 'master' | Phil Hughes | 2017-05-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Use vue file for pipelines tables components See merge request !11760 | ||||
| * | | Use vue file for pipelines tables components31349-pipeline-url-techdeb | Filipa Lacerda | 2017-05-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '31849-pipeline-show-view-realtime' into 'master' | Phil Hughes | 2017-05-30 | 1 | -33/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732 | ||||
| * | | | Creates a mediator for pipeline details vue in order to mount several vue ↵ | Filipa Lacerda | 2017-05-26 | 1 | -33/+26 |
| | |/ | |/| | | | | | | | apps with the same data | ||||
* | | | Add performance deltas between app deployments on Merge Request widget | Kushal Pandya | 2017-05-29 | 2 | -3/+57 |
| | | | |||||
* | | | Merge branch 'fix-up-notes-technical-debt' into 'master' | Fatih Acet | 2017-05-29 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | | | | | | | Fix up some notes.js tech debt See merge request !11283 | ||||
| * | | Fix up some notes tech debtfix-up-notes-technical-debt | Eric Eastwood | 2017-05-26 | 1 | -1/+0 |
| |/ | | | | | | | | | | | | | | | | | Fix up tech debt comments from @jschatz1 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013 | ||||
* | | Merge branch ↵ | Fatih Acet | 2017-05-26 | 1 | -2/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558 | ||||
| * | | Don't use getElementById in specs. | Bryce Johnson | 2017-05-22 | 1 | -2/+2 |
| | | | |||||
| * | | Upgrade Remove Source Branch checkbox UX. | Bryce Johnson | 2017-05-22 | 1 | -2/+35 |
| | | | |||||
* | | | Creates CI Header component to use in pipelines and job details pages | Filipa Lacerda | 2017-05-26 | 2 | -0/+150 |
| | | | |||||
* | | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵ | Clement Ho | 2017-05-26 | 1 | -1/+44 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | 'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700 | ||||
| * | | Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-dom | Eric Eastwood | 2017-05-26 | 1 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888 Reproduction: 1. Visit /namespace/project/merge_requests/x/diffs#note_1234 1. When `#note_1234` isn't in the diff, an error is thrown | ||||
* | | | Use non-global jQuery reference within raven bundle | Luke "Jared" Bennett | 2017-05-25 | 1 | -18/+0 |
| | | | |||||
* | | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 2 | -0/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | store isFetching state to indicate if assignees has initial data | ||||
* | | | | Use import instead of requirefix-eslint | Clement Ho | 2017-05-24 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'dm-paste-code-inside-gfm-code' into 'master' | Filipa Lacerda | 2017-05-24 | 1 | -0/+49 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+49 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Phil Hughes | 2017-05-24 | 5 | -17/+33 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | 5 | -17/+33 |
| |/ / / | |||||
* | | | | Merge branch 'sentry-clientside-releases' into 'master' | Phil Hughes | 2017-05-24 | 2 | -32/+30 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | 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 | 2 | -23/+22 |
| | | | | |||||
| * | | | Read HEAD commit and use as releases value | Luke "Jared" Bennett | 2017-05-19 | 2 | -18/+17 |
| | | | | |||||
* | | | | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-state | Fatih Acet | 2017-05-24 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge branch 'winh-frontend-user-cache' into 'master' | Filipa Lacerda | 2017-05-23 | 2 | -0/+201 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404 | ||||
| * | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cache | winh | 2017-05-23 | 1 | -0/+136 |
| | | | | | |||||
| * | | | | Extract Cache class from AjaxCache | winh | 2017-05-21 | 1 | -0/+65 |
| | | | | | |||||
* | | | | | Merge branch 'winh-recent-searches-service-spec' into 'master' | Fatih Acet | 2017-05-23 | 1 | -22/+30 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Handle Promise rejections in RecentSearchesService spec See merge request !11206 | ||||
| * | | | | Handle Promise rejections in RecentSearchesService spec (!11206)winh-recent-searches-service-spec | winh | 2017-05-11 | 1 | -22/+30 |
| | | | | | |||||
* | | | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 54 | -150/+146 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| * | | | | refactor instances of CJS module.exports to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -6/+2 |
| | | | | | |||||
| * | | | | fix eslint failures | Mike Greiling | 2017-05-16 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | fix implicit window object reference within gl_form_spec | Mike Greiling | 2017-05-16 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | update test_bundle to use ES module syntax | Mike Greiling | 2017-05-16 | 1 | -6/+8 |
| | | | | | |||||
| * | | | | update frontend specs to use ES module syntax | Mike Greiling | 2017-05-16 | 51 | -131/+129 |
| | | | | | |||||
* | | | | | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 1 | -0/+281 |
| | | | | | |||||
* | | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 1 | -2/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| * | | | | | Fix Karma expect | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| * | | | | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
* | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 7 | -5/+138 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| * | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 4 | -69/+12 |
| | | | | |