summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-1/+1
|
* Support descriptions for snippetsJarka Kadlecova2017-05-312-1/+16
|
* Merge branch '30502-fix-bottom-padding-job-page' into 'master'Annabel Dunstone Gray2017-05-301-0/+4
|\ | | | | | | | | | | | | Remove extra bottom padding on Job log page Closes #30502 See merge request !11791
| * Fix bottom padding for build page30502-fix-bottom-padding-job-pagekushalpandya2017-05-301-0/+4
| |
* | Merge branch 'back-port-locked-milestones-to-ce' into 'master'Phil Hughes2017-05-308-40/+83
|\ \ | | | | | | | | | | | | | | | | | | `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-ceEric Eastwood2017-05-268-40/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'winh-merge-request-tree-symbols' into 'master'Annabel Dunstone Gray2017-05-301-6/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of tree symbols in merge requests Closes #29590 See merge request !11761
| * | | Fix alignment of tree symbols in merge requestswinh-merge-request-tree-symbolswinh2017-05-291-6/+2
| | | |
* | | | Merge branch ↵Douwe Maan2017-05-301-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master' 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Closes #19107 See merge request !11754
| * | | | 'New issue'/'New merge request' dropdowns should show only projects with ↵19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-301-1/+8
| | | | | | | | | | | | | | | | | | | | issues/merge requests feature enabled
* | | | | Fix math rendering on blob pagesSean McGivern2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `renderGFM` adds the correct syntax highlighting class and triggers KaTeX if required.
* | | | | Merge branch ↵Fatih Acet2017-05-306-43/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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.jsLuke "Jared" Bennett2017-05-263-4/+10
| | | | | |
| * | | | | Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-262-1/+3
| | | | | |
| * | | | | Restore notifications to MR widgetLuke "Jared" Bennett2017-05-265-43/+52
| | |_|/ / | |/| | |
* | | | | Update looks job logFilipa Lacerda2017-05-302-302/+254
| | | | |
* | | | | Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-303-57/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use vue file for pipelines tables components See merge request !11760
| * | | | | Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-293-57/+66
| | |/ / / | |/| | |
* | | | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵Phil Hughes2017-05-302-4/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744
| * | | | | Backport MR from EEClement Ho2017-05-262-4/+40
| | | | | |
* | | | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-305-65/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
| * | | | | | Use function to define data instead of an object31849-pipeline-show-view-realtimeFilipa Lacerda2017-05-262-4/+6
| | | | | | |
| * | | | | | Creates a mediator for pipeline details vue in order to mount several vue ↵Filipa Lacerda2017-05-265-65/+101
| | |_|/ / / | |/| | | | | | | | | | | | | | | | apps with the same data
* | | | | | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-05-302-0/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays loading icon in async buttons inline Closes #32954 See merge request !11735
| * | | | | Displays loading icon in async buttons inline32954-loading-iconFilipa Lacerda2017-05-262-0/+8
| |/ / / /
* | | | | Add performance deltas between app deployments on Merge Request widgetKushal Pandya2017-05-292-11/+43
| | | | |
* | | | | Merge branch 'fix-up-notes-technical-debt' into 'master'Fatih Acet2017-05-291-108/+115
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix up some notes.js tech debt See merge request !11283
| * | | | Fix up some notes tech debtfix-up-notes-technical-debtEric Eastwood2017-05-261-108/+115
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'apply-same-responsive-notes-to-parallel-diff' into 'master'Annabel Dunstone Gray2017-05-264-33/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Apply responsive note styles to parallel diffs See merge request !11701
| * | | | Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diffEric Eastwood2017-05-264-33/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Fix inspired while working on https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | | | Enable DuplicateProperty scss-lintAnnabel Dunstone Gray2017-05-269-8/+2
| | | | |
* | | | | Merge branch ↵Fatih Acet2017-05-262-3/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | Fallback to false when remove_source_branch is null.Bryce Johnson2017-05-251-1/+1
| | | | |
| * | | | Update shouldRemoveSourceBranch against API entity changes.Bryce Johnson2017-05-251-3/+1
| | | | |
| * | | | Shush eslint.Bryce Johnson2017-05-221-1/+1
| | | | |
| * | | | Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-222-3/+9
| | | | |
* | | | | More consistent padding of notes, system notes, and note formDouwe Maan2017-05-266-39/+53
| |_|/ / |/| | |
* | | | Creates CI Header component to use in pipelines and job details pagesFilipa Lacerda2017-05-263-0/+198
| | | |
* | | | Merge branch 'enable-final-newline' into 'master'Clement Ho2017-05-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable final newline See merge request !11723
| * | | | Enable final newline ruleenable-final-newlineAnnabel Dunstone Gray2017-05-261-1/+1
| | | | |
* | | | | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-261-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585
| * | | | | Consistently display last push event widgetDouwe Maan2017-05-251-4/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵Clement Ho2017-05-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-domEric Eastwood2017-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Set emoji-menu z-index to 200Luke "Jared" Bennett2017-05-261-1/+1
| | | | |
* | | | | Resolve "Resolved discussions icon is misaligned"Luke "Jared" Bennett2017-05-261-1/+9
| |_|_|/ |/| | |
* | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-254-8/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Clean up diff rendering See merge request !11390
| * | | Clean up diff renderingDouwe Maan2017-05-232-5/+1
| | | |
| * | | Consistently style image in blob and diffDouwe Maan2017-05-233-3/+2
| | | |
* | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵Annabel Dunstone Gray2017-05-251-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702