summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Collapse)AuthorAgeFilesLines
* Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-223-9/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Show loading button inline in MR widgetfl-refresh-btnFilipa Lacerda2018-02-161-1/+4
|
* Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-151-0/+1
|\ | | | | | | | | Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
| * Prevent MR Widget error when no CI configured34130-null-pipesSimon Knox2018-02-121-0/+1
| |
* | Moves mr widget components into vue filesfl-mr-widget-4Filipa Lacerda2018-02-135-39/+51
|/ | | | | Adds i18n Improves test cases
* Remove not needed default statementFilipa Lacerda2018-02-091-1/+0
|
* Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-083-44/+64
|
* Backport of mr_widget_author.vue EE changesPhil Hughes2018-02-021-1/+21
|
* Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-026-143/+189
|\ | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16857
| * Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-011-10/+16
| |
| * Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-014-39/+46
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Added more tests and corrected typos Ban Rugged from Repository Improve doc/development/automatic_ce_ee_merge.md fixed infinite loop crashing tests Converted todos.js to axios Converted usage_ping.js to use axios Converted pager.js to axios Converted notifications_form.js to axios Converted notes.js to axios Converted branch_graph.js to axios Converted mini_pipeline_graph_dropdown.js to axios Include subgroup issuables on the group page Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock Replace $.ajax in find file with axios Replace $.ajax in activity calendar with axios Remove namespaced internationalization import Fix subgroup creation docs Fix a JSON schema that doesn't include enough fields Make user/author use project.creator in most factories Enable RuboCop Style/RegexpLiteral ...
| * | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-011-4/+6
| | |
| * | Moves widget header into a vue fileFilipa Lacerda2018-02-014-120/+142
| | |
| * | Moves merge help into a vue componentFilipa Lacerda2018-01-314-25/+41
| | |
* | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-017-58/+78
| |/ |/|
* | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
| |
* | Move mr widget related links into a vue fileFilipa Lacerda2018-01-304-40/+47
|/
* Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-293-140/+193
|\ | | | | | | | | | | | | Move mr_widget_merged into a vue file Closes #42486 See merge request gitlab-org/gitlab-ce!16746
| * Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| |
| * Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-263-140/+193
| |
* | Disable MR check out button when source branch is deletedJacopo2018-01-291-0/+1
|/ | | | After source branch deletion the Merge request `Check out branch` button is disabled.
* Adds missing i18nFilipa Lacerda2018-01-261-2/+2
|
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-255-204/+254
| | | | | | - mr_widget_failed_to_merge - mr_widget_merge_when_pipeline_succeeds Adds i18n
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-253-3/+3
|
* Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-257-103/+135
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Migrate repository bundling to Gitaly Use limit for search count queries Fix offense in runners settings QA page object class Wait for runner until it registers itself in QA tests Fix static-analysis offenses in QA support class Add specific views / selectors for QA runners page Add views / selectors for pipeline show page object ...
| * Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-247-103/+135
| | | | | | | | | | Adds i18n Adds better test coverage
* | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2423-84/+111
|/ | | | Moves merging component into a vue file, adds i18n and better test cases
* Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2210-10/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split the setup-test-env job in two Remove the wait time for the login form check Fix protected branches API to accept name parameter with dot Update outdated docs for CI/CD quick start _never_ unset gitlab.full_path Backport to match EE icons Add horizontal scroll to wiki tables Update best_practices.md Remove duplicate list item in "General Guidelines" Section. Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController Move rugged-call from Project#write_repository_config to Git::Repository#write_config doc: Spelling fixes Update Auto DevOps template Disable scss-lint around text-decoration-skip Add text-decoration-skip: ink to all underlined elements Fix Shows signin tab after new user email confirmation Fixes mistake in change log doc.
| * Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1911-11/+11
| |
* | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
| |
* | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-194-28/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) WebIDE: Fix Commit bugs Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Fix incorrect path for gitlab-shell authorized keys helper Fix duplicate item in protected branch/tag dropdown dynamic imports for groups: pages Refactor dispatcher project mr edit and creation diff path Refactor dispatcher project mr creations new path Rework indexes on redirect_routes to be more effective and enforce a case insensitive unique path Upgraded Karma Dependencies Fix conflict with ee icon Remove trailing space after author name in note header Delete conflicting orphaned routes Make the 'Edit' links consistent in the issuable sidebar Fix a bug calculating artifact size for project statistics Update rubocop, rubocop-rspec, and gitlab-styles Correctly escape UTF-8 path elements for uploads Change cursor to default for disabled buttons Fix eslint Remove Event listener and make code more readable. Update CHANGELOG.md for 10.1.7 ...
| * Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-194-27/+35
| |\ | | | | | | | | | | | | Move archived component to vue file See merge request gitlab-org/gitlab-ce!16561
| | * Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| | |
| | * Move archived component to vue fileFilipa Lacerda2018-01-184-27/+35
| | |
| * | Merge branch 'dispatcher-projects' into 'master'Filipa Lacerda2018-01-181-1/+1
| |\ \ | | |/ | |/| | | | | | | Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389
| | * Added dispatcher imports for some project routesPhil Hughes2018-01-161-1/+1
| | |
* | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-184-48/+56
|/ /
* | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-171-1/+1
|/
* Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-151-5/+4
|
* Fix broken specsFilipa Lacerda2018-01-091-3/+2
|
* Fix more eslint rulesFilipa Lacerda2018-01-081-1/+3
|
* [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-062-10/+14
|
* Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-057-0/+154
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (78 commits) Use --left-right and --max-count for counting diverging commits API: get participants from merge_requests & issues Copy Mermaid graphs as GFM Rephrase paragraph about e2e tests in merge requests in docs Remove EE only sections from docs Update redis-rack to 2.0.4 Refactor matchers for background migrations Add id to modal.vue to support data-toggle="modal" Allow local tests to use a modified Gitaly Fix specs Use computed prop in expand button Update check.md add deprecation and removal issue to docs Add status attribute to runner api entity Fix typos in a code comment Refactor RelativePositioning so that it can be used by other classes Backport 'Rebase' feature from EE to CE Just try to detect and assign once Fix custom name in branch creation for issue in Firefox Modify `LDAP::Person` to return username value based on attributes ...
| * Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-057-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | [ci skip] Fix more rulesFilipa Lacerda2018-01-051-16/+21
|/
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-043-30/+28
|\ | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-021-0/+4
| | | | | | | | closed/merged
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-30/+24
| |
* | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-028-68/+58
|/
* Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-191-2/+2
|
View Lorry Controller Status