summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-152-2/+3
|
* IDE sends last commit ID when committing changesPhil Hughes2018-06-153-46/+20
| | | | Closes #46192
* Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' ↵Douwe Maan2018-06-151-1/+1
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Make the html attribute on the blob json call optional" Closes #46668 See merge request gitlab-org/gitlab-ce!19479
| * Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-151-1/+1
| |
| * Makes the html attribute in the json output optional with the option ↵Tim Zallmann2018-06-141-1/+1
| | | | | | | | html_render=false
* | Remove scrollbar in Safari in repo settings pagegfyoung2018-06-141-1/+1
| | | | | | | | Closes #47410.
* | Merge branch 'jivl-fix-create-project-template-buttons' into 'master'Annabel Gray2018-06-143-25/+20
|\ \ | | | | | | | | | | | | | | | | | | Fix use template buttons for creating a new project Closes #47580 See merge request gitlab-org/gitlab-ce!19654
| * | Fix template iconsClement Ho2018-06-141-0/+6
| | |
| * | Remove vertical-alignment from project template buttonsjivl-fix-create-project-template-buttonsJose2018-06-131-2/+4
| | |
| * | Use d-blockClement Ho2018-06-133-10/+2
| | |
| * | Fix change template formClement Ho2018-06-132-19/+10
| | |
| * | Fix use template buttons for creating a new projectJose2018-06-131-0/+4
| | |
* | | Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-142-1/+2
| | |
* | | Merge branch '47905-user-tabs-doesn-t-show-spinner' into 'master'Annabel Gray2018-06-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "User tabs doesn't show spinner" Closes #47905 See merge request gitlab-org/gitlab-ce!19862
| * | | Fix user tabs loading indicatorClement Ho2018-06-141-1/+1
| | | |
* | | | Resolve "Project homepage > Clone dropdown/input larger than other buttons"Annabel Gray2018-06-141-0/+2
| | | |
* | | | Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-142-3/+3
| | | |
* | | | Merge branch '47675-strange-layout-for-pipelines-list-view' into 'master'Annabel Gray2018-06-141-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Strange layout for pipelines list view" Closes #47675 and #47858 See merge request gitlab-org/gitlab-ce!19788
| * | | Fix overflow for pipelines table47675-strange-layout-for-pipelines-list-viewClement Ho2018-06-131-0/+1
| | | |
* | | | Merge branch '47646-ui-glitch' into 'master'Clement Ho2018-06-141-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GFM: Color chips UI glitch" Closes #47646 See merge request gitlab-org/gitlab-ce!19687
| * | | | line-height fixed for color chipsMurat Dogan2018-06-121-0/+1
| | | | |
* | | | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-145-11/+11
| | | | |
* | | | | Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-143-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resets state correctly when switching to merge request in IDE Closes #47763 See merge request gitlab-org/gitlab-ce!19707
| * | | | | Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-133-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Closes #47763
* | | | | | Merge branch 'remove-link-label-vertical-alignment-property' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove label link vertical alignment property Closes #46080 See merge request gitlab-org/gitlab-ce!18777
| * | | | | Change label link vertical alignment propertyGeorge Tsiolis2018-05-071-1/+1
| | | | | |
* | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap YAML error in Web IDE pipelines panel Closes #47755 See merge request gitlab-org/gitlab-ce!19736
| * | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes #47755
* | | | | | enable CommonMark as the defaultBrett Walker2018-06-141-14/+22
| | | | | |
* | | | | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-131-16/+35
| | | | | |
* | | | | | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the btn-xs class from the stylesheets Closes #46743 See merge request gitlab-org/gitlab-ce!19719
| * | | | | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
| | | | | |
* | | | | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge request diff loading icon not visible" Closes #47830 and #47849 See merge request gitlab-org/gitlab-ce!19758
| * | | | | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
| | | | | | |
* | | | | | | Flex board columnsPaul Slaughter2018-06-131-5/+6
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Removes merge conflicts vue code from globalnamespace See merge request gitlab-org/gitlab-ce!19750
| * | | | | Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13246-1064/+1148
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add documentation: Overview of Frontend Testing Resolve "Add `/confidential` quick action for issues" i18n: externalize strings from 'app/views/award_emoji' Fix broken tests due to bad conflict resolution Updates eslint rules Documentation does not need an exception to be picked Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue [Rails5] Fix `storage_counter` helper Adjust SQL and transaction Prometheus buckets Updates eslint vue plugin version
| * | | | | | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
| | | | | | |
* | | | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Board list creation is broken" Closes #47823 See merge request gitlab-org/gitlab-ce!19746
| * | | | | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-134-6/+4
| |_|/ / / |/| | | |
* | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13246-1064/+1148
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Updates eslint vue plugin version See merge request gitlab-org/gitlab-ce!19648
| * | | | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3
| | | | |
| * | | | Updates eslint rulesFilipa Lacerda2018-06-136-23/+23
| | | | |
| * | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1322-42/+930
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (27 commits) Resolve "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used"" Resolve "Provide ability to retrieve `visibility` level via Snippets API" Resolve "Quick actions are case sensitive" Image Diff Viewing + Download Diff Viewing Link to release post for group issue board docs moved strings into constants file Typo fix fixed condition check Loosen the 'newly created MR' matcher Ensure we look into the correct setion only when expanding a settings' section Rails5 fix expected `issuable.reload.updated_at` to have changed [Rails5] Pass class references instead of strings to middleware builder Sidebar Milestone - Fix wrong URL when selecting a parent group milestone Fix Banzai reference for milestones belonging to parent groups apply feedback fixed eslint added specs for is-active class added spec for openPendingTab in component more karma fixes karma updates Override exclusive_lease_key method in RecordsUpload ...
| * | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
| | | | | |
| * | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-136-5/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Restoring user v3 endpoint Resolve "Use one column form layout on Admin Area Settings page" Resolve "Participants tooltip is cutoff when too close to the window edge" Fix group member filter layout Align nav bar items Fix labels too large Added with_statsoption for GET /projects/:id/repository/commits Fixed IDE jobs empty state showing when loading Fixes Microsoft Teams notifications for pipeline events Migrate compare_source_branch to use only Gitaly Clean up stale Prometheus metrics in before_exec unicorn hook Remove top padding from .col-form-label
| * | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: mergeError message has been binded using v-html directive Find and mark more Git disk access locations, part 2 Ensure MR diffs always exist in the PR importer
| * \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1211-17/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (47 commits) Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter i18n: document how to use links without splitting sentences Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb" Add CI job to check Gemfile.rails5.lock Add navigation theme documentation Move Gitaly branch/tag/ref RPC's to opt-out Add CI_{PIPELINE,JOB}_URL Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project"" fixed/enhanced command-line documentation Use nip.io instead of xip.io [Rails5] Update Gitlab.rails5.lock Fix typo in doc/development/README.md Update import screenshot without LFS warning Hide overflow on hr Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar" Fix collapse sidebar button color Remove .row and .col-sm-12 Relax expectation in spec/models/project_spec.rb fix padding in commit info GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong ...
| * \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-118-17/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (48 commits) Avoid checking the user format in every url validation Migrate CycleAnalytics::CommitCount to Gitaly Hide project name if searching against a project Unify app/views/search/results by using EE Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Update MrWidgetAuthorTime and MRWidgetMerged spec fixed specs Fix IDE pipelines eTagPoll not stopping Don't use Gitlab::Utils.nlbr in Gitlab::Git Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out Rename MrWidgetAuthorTime vue component Use Tooltip component in MrWidgetAuthorTime vue component set max_old_space_size to 3.5 GB for compile-assets job Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 Add missing `:comment` attribute Prevent ENV from leaking variables in CI output Bump grape-path-helpers to 1.0.5 Add more logging before a project is destroyed Bump Google Chrome to V67 Upgrade gitlab-markup to fix render issue with reStructuredText ...