Skip to content

merge ru urm q2#2805

Closed
DominikAlberski wants to merge 59 commits intomasterfrom
merge_ror_urm_q2
Closed

merge ru urm q2#2805
DominikAlberski wants to merge 59 commits intomasterfrom
merge_ror_urm_q2

Conversation

@DominikAlberski
Copy link
Copy Markdown
Contributor

@DominikAlberski DominikAlberski commented Feb 28, 2024 •
edited
Loading

Seems like we are missing #2795 here but Gabriel has made some changes to that file.

AndriiMysko and others added 30 commits February 8, 2023 17:33
@AndriiMysko
New payment details implementation
85920aa
@AndriiMysko
Fix tests
aa51d29
@AndriiMysko
Antifraud for v1 plans
9cfef7e
@AndriiMysko
Adjust tests
6376286
@AndriiMysko
Merge branch 'payment_method_tab_am' into new_user_journey_dev
c975f4c
@AndriiMysko
fix for lack of first_sync for assembla
5de968c
@AndriiMysko
added hosted billing help
62e6d28
@Jullianos @AndriiMysko
Add the new macOS information section in select-plan and modify billi…
d97e061 
…ng scss styles
@AndriiMysko
Adjust manual and github plans view
105949e
@AndriiMysko
Fix local registration checkbox
6e2a22a
@AndriiMysko
ui updates
773022e
@AndriiMysko
redirection attempt, wizard fix, trial plan desc
6bea8b3
@AndriiMysko
ui updates
02ad650
@AndriiMysko
sync subscriptions on first_syn
6ae4961
@AndriiMysko
redirect from ghapp installation to firstsync
21cd028
@gbarc80
style fixes,profile menu update,fix for company
4d42873
@gbarc80
tests update
1c2bfbb
@gbarc80
ui updates
c3d6c3c
@gbarc80
ui updates
30201a8
@gbarc80
redirection updates, typos fixed
028299d
@gbarc80
ui updates - plan, wizard, activation
4fa677a
@gbarc80
coupon
b105838
@gbarc80
installation redirections, email banner update
c33ec59
@gbarc80
random ui updates
edf92a0
@gbarc80
lint
6340e63
@gbarc80
total price hide
fee0e23
@gbarc80
empty invoices field, installation_id fix
09cf0e4
@gbarc80
radio color,mail banner, double badge
ee76cf6
@gbarc80
ui fixes - review 03.28
4b41c15
@gbarc80
sync popup improvement
80313d7
gbarc-dt and others added 28 commits May 24, 2023 15:36
@gbarc-dt
activation button fix
167d2fe
@gbarc-dt
lint
ef0700b
@gbarc-dt
user roles wip
120be38
@murtaza-swati
Merge branch 'master' into new_user_journey_dev
3f31080
@gbarc-dt
logs, settings, caches
6d31388
@gbarc-dt
fixed the condition for settings
a654110
@gbarc-dt
perm fixes/test fixes
8ca05ca
@gbarc-dt
usage banner fix, settings from profile access check
5b530c3
@gbarc-dt
tests
c65308e
PRD Travis ASM Handshake
0d61a3d
PRD New User Journey
ff9738d
@gbarc-dt
Merge branch 'new_user_journey_dev' into dt-userroles-prd
4c54695
@gbarc-dt
selected plan up
9b2e683
@gbarc-dt
lint
c5fdd38
@gbarc-dt
lint
8237b79
@gbarc-dt
activate update
5e1c004
@gbarc-dt
ruby up
d99d257
@gbarc-dt
Merge branch 'dt-ror-update' into prd-ruby-upgrade-dev
736ae5d
@gbarc-dt
some rubocop reverts
d4c514d
@gbarc-dt
w/a for stripe issue with font
8f0cdaf
@gbarc-dt
Merge remote-tracking branch 'origin/prd-ruby-upgrade' into prd-ruby-…
5b82c6e 
…upgrade-dev
@gbarc-dt
Merge remote-tracking branch 'origin/dt-userroles-prd' into prd-ror-u…
563636f 
…r-merge
@gbarc-dt
Q2+Q1 merge
82fcadc 
* Added log limit using env var (#2781)
* Api key regenerate (#2782)
* [BSFY-259] Assembla portfolio update (#2784)
* Pass credit card fingerprint on payment details update (#2783)
* scan feature flag (#2776)
* email subscriptions (#2775)
@gbarc-dt
log limit env
0ff576a
@gbarc-dt
removed org admin reqs for some menus
5810221
@GbArc
typo fix
ed053c5
@DominikAlberski
Merge branch 'dt-q2-ror' into merge_ror_urm_q2
b6255d3
@DominikAlberski
Merge branch 'dt-orgadmin_fixes' into merge_ror_urm_q2
9e40072
@DominikAlberski DominikAlberski changed the title merge all 3 projects merge ru urm q2 Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@DominikAlberski @AndriiMysko @Jullianos @gbarc80 @gbarc-dt @murtaza-swati @GbArc