Skip to content

Commit eb27042

Browse files
adliusadlius
committed
Merge branch 'release/23.07.0'
2 parents 01454f7 + faca7a0 commit eb27042

File tree

104 files changed

+1464
-1465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1464
-1465
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ jobs:
188188
key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
189189
restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
190190
- run: yarn percy build:finalize
191+
if: ${{ env.PERCY_TOKEN != 0 }}
191192
env:
192193
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
193194
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [23.07.0] - 2023-05-01
8+
### Changed
9+
- Fix some deprecations
10+
- Removed Bootstrap Grid
11+
12+
713
## [23.06.0] - 2023-03-27
814
### Changed
915
- Removed Keen dependencies
@@ -1921,7 +1927,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
19211927
### Added
19221928
- Quick Files
19231929

1924-
[23.05.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
1930+
[23.07.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.07.0
1931+
[23.06.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.1
1932+
[23.06.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
19251933
[23.05.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.05.0
19261934
[23.04.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.04.0
19271935
[23.03.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.03.0

‎app/adapters/osf-adapter.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ export default class OsfAdapter extends JSONAPIAdapter {
158158
ajaxOptions(url: string, type: RequestType, options?: { isBulk?: boolean }): object {
159159
const hash: any = super.ajaxOptions(url, type, options);
160160

161-
hash.xhrFields = {
162-
withCredentials: true,
163-
};
161+
hash.credentials = 'include';
164162

165163
if (options && options.isBulk) {
166164
hash.contentType = 'application/vnd.api+json; ext=bulk';

‎app/guid-node/forks/styles.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.Forks {
22
display: grid;
33
grid-template-rows: auto;
4+
width: 100%;
45
}
56

67
@media screen and (max-width: 500px) {

‎app/register/controller.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Store from '@ember-data/store';
12
import Controller from '@ember/controller';
23
import { computed } from '@ember/object';
34
import { inject as service } from '@ember/service';
@@ -29,6 +30,7 @@ export const registerQueryParams = new QueryParams<RegisterQueryParams>({
2930

3031
export default class Register extends Controller.extend(registerQueryParams.Mixin) {
3132
@service analytics!: Analytics;
33+
@service store!: Store;
3234

3335
signUpCampaign?: string;
3436

‎app/settings/template.hbs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<div class='col-xs-12'>
44
<h2 class='page-header'>
55
{{t 'general.settings'}}
6-
<BsButton
6+
<Button
77
local-class='NavToggle'
88
aria-label={{t 'settings.toggleNav'}}
99
class='hidden-md hidden-lg'
10-
@type='link'
11-
@onClick={{action (mut this.navCollapsed) (not this.navCollapsed)}}
10+
@layout='fake-link'
11+
{{on 'click' (action (mut this.navCollapsed) (not this.navCollapsed))}}
1212
>
1313
<FaIcon @icon='bars' />
14-
</BsButton>
14+
</Button>
1515
</h2>
1616
</div>
1717
</div>
@@ -21,12 +21,12 @@
2121
<div class='panel panel-default'>
2222
<BsNav @type='pills' @stacked={{true}} as |nav|>
2323
<nav.item>
24-
<nav.link-to
24+
<OsfLink
2525
data-analytics-name='Settings'
26-
@params={{array 'settings.profile'}}
26+
@route='settings.profile'
2727
>
2828
{{t 'settings.profile.title'}}
29-
</nav.link-to>
29+
</OsfLink>
3030
<BsNav
3131
data-analytics-scope='Profile Nav'
3232
local-class='ProfileNav'
@@ -35,46 +35,46 @@
3535
as |profileNav|
3636
>
3737
<profileNav.item>
38-
<profileNav.link-to
38+
<OsfLink
3939
data-analytics-name='Name'
40-
@params={{array 'settings.profile.name'}}
40+
@route='settings.profile.name'
4141
>
4242
{{t 'settings.profile.name.title'}}
43-
</profileNav.link-to>
43+
</OsfLink>
4444
</profileNav.item>
4545
<profileNav.item>
46-
<profileNav.link-to
46+
<OsfLink
4747
data-analytics-name='Social'
48-
@params={{array 'settings.profile.social'}}
48+
@route='settings.profile.social'
4949
>
5050
{{t 'settings.profile.social.title'}}
51-
</profileNav.link-to>
51+
</OsfLink>
5252
</profileNav.item>
5353
<profileNav.item>
54-
<profileNav.link-to
54+
<OsfLink
5555
data-analytics-name='Education'
56-
@params={{array 'settings.profile.education'}}
56+
@route='settings.profile.education'
5757
>
5858
{{t 'settings.profile.education.title'}}
59-
</profileNav.link-to>
59+
</OsfLink>
6060
</profileNav.item>
6161
<profileNav.item>
62-
<profileNav.link-to
62+
<OsfLink
6363
data-analytics-name='Employment'
64-
@params={{array 'settings.profile.employment'}}
64+
@route='settings.profile.employment'
6565
>
6666
{{t 'settings.profile.employment.title'}}
67-
</profileNav.link-to>
67+
</OsfLink>
6868
</profileNav.item>
6969
</BsNav>
7070
</nav.item>
7171
<nav.item>
72-
<nav.link-to
72+
<OsfLink
7373
data-analytics-name='Account'
74-
@params={{array 'settings.account'}}
74+
@route='settings.account'
7575
>
7676
{{t 'settings.account.title'}}
77-
</nav.link-to>
77+
</OsfLink>
7878
</nav.item>
7979
<nav.item>
8080
<OsfLink
@@ -93,20 +93,20 @@
9393
</OsfLink>
9494
</nav.item>
9595
<nav.item>
96-
<nav.link-to
96+
<OsfLink
9797
data-analytics-name='Developer apps'
98-
@params={{array 'settings.developer-apps'}}
98+
@route='settings.developer-apps'
9999
>
100100
{{t 'settings.developer-apps.title'}}
101-
</nav.link-to>
101+
</OsfLink>
102102
</nav.item>
103103
<nav.item>
104-
<nav.link-to
104+
<OsfLink
105105
data-analytics-name='Personal access tokens'
106-
@params={{array 'settings.tokens'}}
106+
@route='settings.tokens'
107107
>
108108
{{t 'settings.tokens.title'}}
109-
</nav.link-to>
109+
</OsfLink>
110110
</nav.item>
111111
</BsNav>
112112
</div>

‎app/styles/_variables.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $sizes: ('xs', 'sm', 'md', 'lg', 'xl');
1414
$margins: (5, 10, 15, 25, 50);
1515
$spinner-size: (10, 20, 30, 50, 75);
1616
$weights: (200, 300, 400, 500, 600);
17+
$mobile-width: 768px;
1718

1819
/* Defaults */
1920
$radius: 2px;

‎config/deprecation-workflow.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
self.deprecationWorkflow = self.deprecationWorkflow || {};
22
self.deprecationWorkflow.config = {
33
workflow: [
4-
{ handler: 'silence', matchId: 'ember-inflector.globals' },
54
{ handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
65
{ handler: 'silence', matchId: 'this-property-fallback' },
7-
{ handler: 'silence', matchId: 'ember-glimmer.link-to.positional-arguments' },
8-
{ handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' },
96
{ handler: 'silence', matchId: 'ember-bootstrap.subclassing#Alert' },
107
{ handler: 'silence', matchId: 'routing.transition-methods' },
11-
{ handler: 'silence', matchId: 'autotracking.mutation-after-consumption' },
12-
{ handler: 'silence', matchId: 'computed-property.override' },
138
{ handler: 'silence', matchId: 'ember-utils.try-invoke' },
14-
{ handler: 'silence', matchId: 'ember-data:legacy-test-helper-support' },
159
{ handler: 'silence', matchId: 'has-block-and-has-block-params' },
1610
{ handler: 'silence', matchId: 'ember-simple-auth.initializer.setup-session-restoration' },
1711
{ handler: 'silence', matchId: 'ember-simple-auth.events.session-service' },
1812
{ handler: 'silence', matchId: 'ember-cli-mirage.miragejs.import' },
1913
{ handler: 'silence', matchId: 'ember-cli-mirage-config-routes-only-export' },
14+
{ handler: 'silence', matchId: 'ember-engines.deprecation-router-service-from-host'},
15+
{ handler: 'silence', matchId: 'ember-test-waiters-legacy-module-name'},
2016
],
2117
};

‎config/optional-features.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"application-template-wrapper": false,
33
"default-async-observers": true,
4-
"jquery-integration": true,
4+
"jquery-integration": false,
55
"template-only-glimmer-components": true
66
}

‎handbook-docs/index/template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This handbook is a guide for developers contributing to
44
[ember-osf-web](https://github.com/CenterForOpenScience/ember-osf-web).
55

66
It is meant to be a living document, forever a work in progress.
7-
Feel free to {{#link-to 'docs.contributing'}}contribute{{/link-to}}
7+
Feel free to <LinkTo @route='docs.contributing'>contribute</LinkTo>
88
if you notice any omissions, gaps, or inaccuracies.
99

1010
Go science!

0 commit comments

Comments
 (0)