~cytrogen/masto-fe

406f3942 — Antonin Del Fabbro 2 years ago
[Glitch] Change opacity of the delete icon in the search field to be more visible

Port 9a8190da4a7a5bd74df36ae076573e014b254ef0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
32e67e78 — Claire 2 years ago
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
def58f8a — Christian Schmidt 2 years ago
[Glitch] Fix some React warnings

Port 152b10b6246987bfb2cc73ecd2a20578d05b62dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
b6b68b44 — Claire 2 years ago
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream

Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
d65aa507 — Claire 2 years ago
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
bdce7818 — Claire 2 years ago
[Glitch] Fix layout of the closed registrations modal

Port fe31571965a6b261165342ec97d11d67f0fae12b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
9b094f36 — Christian Schmidt 2 years ago
[Glitch] Fix profile picture preview

Port SCSS changes from bb23116e8d17b0fa7564a0f713c48753cfba7023 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
296b3d15 — Claire 2 years ago
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
88ff45a3 — Claire 2 years ago
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
fbfc4145 — Claire 2 years ago
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
1b5d3fdc — Claire 2 years ago
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
e67c28a5 — Christian Schmidt 2 years ago
[Glitch] Remove redundant ready() wrapper

Port bb51c0676d0cf27babc2c01ee337ca5fd24ae37c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7b09f585 — Claire 2 years ago
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
e3fd0719 — renovate[bot] 2 years ago
Update dependency rspec-sidekiq to v4 (#26627)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
8eb09466 — Claire 2 years ago
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
9a8190da — Antonin Del Fabbro 2 years ago
Change opacity of the delete icon in the search field to be more visible (#26449)

f3370088 — Daniel M Brasil 2 years ago
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239)

b91724fb — jsgoldstein 2 years ago
Add elastic search installation into Vagrantfile (#26512)

34f5b90d — renovate[bot] 2 years ago
Update dependency sass to v1.66.1 (#26534)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
060b554a — renovate[bot] 2 years ago
Update dependency oj to v3.16.0 (#26520)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Next