summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '48894-fix-rss-button-interaction' into 'master'Annabel Gray2018-07-131-0/+7
|\ | | | | | | | | | | | | Fix RSS button interaction on Dashboard, Project and Group activities Closes #48894 See merge request gitlab-org/gitlab-ce!20549
| * Fix RSS button interaction on Dashboard, Project and Group activitiesKushal Pandya2018-07-131-0/+7
| |
* | Merge branch 'ide-pipeline-icon-open' into 'master'Filipa Lacerda2018-07-131-6/+15
|\ \ | |/ |/| | | | | | | | | Open pipeline list panel when clicking CI icon in Web IDE Closes #47843 See merge request gitlab-org/gitlab-ce!20516
| * Open pipeline list panel when clicking CI icon in Web IDEide-pipeline-icon-openPhil Hughes2018-07-101-6/+15
| | | | | | | | Closes #47843
* | Backport mr widget changes from EEbackport-widget-changesAnnabel Dunstone Gray2018-07-123-2/+6
| |
* | Vuex test helper improvementsLukas Eipert2018-07-122-2/+2
| |
* | Resolve "Improve performance of MR Changes tab: reduce event listeners on ↵Filipa Lacerda2018-07-125-81/+21
| | | | | | | | scroll event"
* | Merge branch 'ide-row-dropdown-design-update' into 'master'Filipa Lacerda2018-07-1213-170/+276
|\ \ | | | | | | | | | | | | | | | | | | Improvements to new entry dropdowns in Web IDE Closes #44845 See merge request gitlab-org/gitlab-ce!20526
| * | Improvements to new entry dropdowns in Web IDEPhil Hughes2018-07-1113-170/+276
| | | | | | | | | | | | Closes #44845
* | | Merge branch '48934' into 'master'Mike Greiling2018-07-111-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix #48934 - Focus on text input on danger confirmation Closes #48934 See merge request gitlab-org/gitlab-ce!20435
| * | | Fix #48934 - Focus on text input on danger confirmationJamie Schembri2018-07-061-1/+4
| | | |
* | | | Merge branch 'fix-mr-widget-border' into 'master'Filipa Lacerda2018-07-111-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
| * | | | Fix MR widget borderAnnabel Dunstone Gray2018-07-111-6/+0
| | | | |
* | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-115-133/+1
|/ / / / | | | | | | | | | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* | | | Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-117-19/+102
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
| * | | Adds specs for toggleFileDiscussions actionFilipa Lacerda2018-07-111-3/+1
| | | |
| * | | Adds specs for getters in merge request vuex diff moduleFilipa Lacerda2018-07-111-1/+0
| | | |
| * | | Merge branch 'master' into 48237-toggle-file-commentsFilipa Lacerda2018-07-1021-687/+826
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
| * | | | Fixes toggle discussion button not expanding collapsed discussionsFilipa Lacerda2018-07-106-6/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussions were being toggled by jquery DOM querying them and toggling visibility but in vue, only the open discussions will be in the DOM Fix includes: - Adds a getter to the store to get the expanded discussions - Adds an action to collapse a discussion - When the user clicks the button, all data needed is now accessible through a getter and we can dispatch an action to toggle the discussion within the state, instead of showing/hiding with jQuery - Removes hardcoded properties Resolves #48237
| * | | | Removes hardcoded and unused propFilipa Lacerda2018-07-091-4/+0
| | | | |
* | | | | Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"Winnie Hellmann2018-07-101-1/+1
| |/ / / |/| | | | | | | This reverts merge request !20140
* | | | Support manually stopping any environment from the UIWinnie Hellmann2018-07-1013-648/+795
| | | |
* | | | Merge branch '48951-clean-up' into 'master'Phil Hughes2018-07-103-23/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR refactor: All actions under diff module are being exported twice" Closes #48951 See merge request gitlab-org/gitlab-ce!20499
| * | | | Removes unused store in diffs mr refactorFilipa Lacerda2018-07-093-23/+3
| | |_|/ | |/| | | | | | | | | | Removes double export for actions in diffs module in mr refactor
* | | | Merge branch 'od/41671' into 'master'Mike Greiling2018-07-091-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve the correct start/due dates on milestones when editing Closes #41671 See merge request gitlab-org/gitlab-ce!20279
| * | | | save current date before Pikaday initOrlando Del Aguila2018-06-291-1/+3
| | | | |
* | | | | Fix search bar text input alignmentClement Ho2018-07-091-1/+4
| |_|/ / |/| | |
* | | | Merge branch 'master' into 48960-namespace-diff-moduleFilipa Lacerda2018-07-097-29/+60
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Resolve "MR refactor: Performance costs of main element with `v-if`" Add documentation on private projects Make blob and other RPC's mandatory Removed return statements from prettier script Add missing strings to `locale/gitlab.pot` Update `gettext:updated_check` regenerate pot file Include wget in apk add command [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace' Updated color Update doc on new option to add README when creating a project Make more things mandatory Updated (color of indent guide in Web IDE Make all Gitaly diff flags mandatory
| * | | Resolve "MR refactor: Performance costs of main element with `v-if`"Tim Zallmann2018-07-096-31/+59
| | | |
| * | | Merge branch 'ide-indent-guide' into 'master'Filipa Lacerda2018-07-091-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated color of indent guide in Web IDE Closes #48931 See merge request gitlab-org/gitlab-ce!20425
| | * | | Updated colorPhil Hughes2018-07-061-1/+1
| | | | |
| | * | | Updated (color of indent guide in Web IDEPhil Hughes2018-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | Closes #48931
* | | | | Merge branch 'master' into 48960-namespace-diff-moduleFilipa Lacerda2018-07-0931-271/+552
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) Update the dependencies license list for 11.1.0 Update .gitignore, .gitlab-ci.yml, and Dockerfile templates for 11.1.0 This updates only the actual new discussion and not the full tree , which leads to a very costly full rerender Resolve "MR Refactor: Improve performance by setting v-once" Changed Inline + Parallel Views to v-if instead of v-show add basic export to fix timeout problem on import_file_spec.rb Add changelog entry for !20465 Improve render performance of large wiki pages Refactor rspec matchers in read_only_spec.rb add CHANGELOG.md entry for !20461 resolve node 6 compatibility issues Add missing foreign key in import_export_uploads Redesign for mr widget info and pipelines section Use proper markdown rendering for previews remove extra tick for eks docs Make it clear that we need to enable omniauth for SAML and Bitbucket Add GPL Commitment language Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker} Ability to check if underlying database is read only fix spec ...
| * | | | Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Adding a diff line note freezes the browser" Closes #48906 See merge request gitlab-org/gitlab-ce!20476
| | * | | | This updates only the actual new discussion and not the full tree , which ↵Tim Zallmann2018-07-093-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | leads to a very costly full rerender
| * | | | | Resolve "MR Refactor: Improve performance by setting v-once"Tim Zallmann2018-07-085-29/+20
| |/ / / /
| * | | | Changed Inline + Parallel Views to v-if instead of v-showTim Zallmann2018-07-071-2/+2
| | | | |
| * | | | Redesign for mr widget info and pipelines sectionClement Ho2018-07-0611-230/+444
| | | | |
| * | | | Use proper markdown rendering for previewsBrett Walker2018-07-0611-6/+74
| | | | |
* | | | | Transforms diffs module to a namespaced one to avoid console error due to ↵Filipa Lacerda2018-07-0611-12/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | rewire export. Detailed: Because of rewire we need to export a default empty object in our actions to prevent it to export the wrong default in karma. Vuex getters are global, and because the Vuex store uses several non namespaced moduled, there was already a getter named default, due to the same empty export. In order to solve it I chose to namespace the module. Could also be fixed by importing the getters explicitly instead of all of them.
* | | | Merge branch 'fl-mr-refactor-performance-improvements' into 'master'Tim Zallmann2018-07-066-50/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves MR refactor getters and state and adds specs Closes #48937 See merge request gitlab-org/gitlab-ce!20429
| * | | | Exports getters individually.Filipa Lacerda2018-07-066-50/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Exports state to allow tests Adds specs for the getters that didn't have any.
* | | | | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-063-0/+64
| | | | |
* | | | | Merge branch 'revert-e76b176d' into 'master'Clement Ho2018-07-061-6/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'" See merge request gitlab-org/gitlab-ce!20428
| * | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'"Victor Wu2018-07-061-6/+5
| | |_|_|/ | |/| | | | | | | | This reverts merge request !19250
* | | | | Resolve "Add dropdown to Groups link in top bar"Dennis Tang2018-07-0628-753/+808
|/ / / /
* | | | Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-068-62/+142
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Added merge request info to Web IDE sidebar Closes #45187 See merge request gitlab-org/gitlab-ce!19860
| * | | fixed misaligned iconPhil Hughes2018-07-061-1/+1
| | | |
| * | | updated iconPhil Hughes2018-07-051-1/+1
| | | |
| * | | fixed where the scrollbar is shown in the merge request panelPhil Hughes2018-07-052-4/+7
| | | |