| Age | Commit message (Collapse) | Author |
|---|
|
Revert "Merge branch 'winh-remove-sushi' into 'master'"
See merge request gitlab-org/gitlab-ce!26470
|
|
'ce-6618-extract-ee-specific-files-lines-for-create-spec-finders' into 'master'
[CE] Extract EE specific files/lines from spec/finders
Closes gitlab-ee#10142 and gitlab-ee#10141
See merge request gitlab-org/gitlab-ce!26337
|
|
This reverts merge request !26430
|
|
Remove .raw from JavaScript fixture file names
Closes #59201
See merge request gitlab-org/gitlab-ce!26430
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
There is nothing more to say but
"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"
|
|
Deploy boards now will check for app.gitlab.com/env and
app.gitlab.com/app
|
|
'58844-follow-up-from-don-t-create-ee-specific-files-when-creating-emojis-fixture-files' into 'master'
Simplify JavaScriptFixturesHelpers
Closes gitlab-ee#10386, #58898, and #58844
See merge request gitlab-org/gitlab-ce!26045
|
|
In this commit, some methods that aren't being used
are removed from `Gitlab::Shell`. They are the ff:
- `#remove_keys_not_found_in_db`
- `#batch_read_key_ids`
- `#list_key_ids`
The corresponding methods in `Gitlab::Keys` have been
removed as well.
|
|
- Only storing fixtures in one place
- This place changes whether we are in CE or EE
We discovered with @winh that only fixtures located under
spec/javascripts/fixtures are used, even in EE so there's no need to
clean/create fixtures in ee/spec/javascripts/fixtures.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Fix error creating a merge request when diff includes a null byte
Closes #57710
See merge request gitlab-org/gitlab-ce!26190
|
|
Reduce queries in spec/requests/api/merge_requests_spec.rb
See merge request gitlab-org/gitlab-ce!26110
|
|
If a diff happened to include a single null byte anywhere, insertion
into the database would fail with an Error 500 since the column is text
and not a byte array. To fix this, we mark the diff as binary if we
detect a single null byte and Base64-encode it.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57710
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
This reduces the queries from 97137 to 65136 and the query time from
02:04 to 01:27 in spec/requests/api/merge_requests.rb.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
This reverts merge request !25723
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Adds Rubocop ReturnNil cop
Closes #57454
See merge request gitlab-org/gitlab-ce!25034
|
|
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
|
|
These adjustments make sure our GraphQL helpers support rendering
queries for empty fields like this:
{
echo(text: "Hello world")
}
Instead of like this:
{
echo(text: "Hello world") {
}
}
The latter would be an invalid query, causing parsing errors.
|
|
* Support label parameter as comma separated and array of strings
for merge requests and issues api endpoints
|
|
Updated ContextualSidebar to render collapsed on smaller screens
Closes #38010
See merge request gitlab-org/gitlab-ce!24555
|
|
Show pg_stat_activity before each test run
See merge request gitlab-org/gitlab-ce!25723
|
|
|
|
Maybe this will help us debug
https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
|
|
|
|
[master] Check issue milestone availability
See merge request gitlab/gitlabhq!2788
|
|
|
|
Check snippet attached file to be moved is within designated directory
Closes #2806
See merge request gitlab/gitlabhq!2903
|
|
Ensure request to link GroupSAML acount was GitLab initiated
See merge request gitlab/gitlabhq!2976
|
|
Updated nav-sidebar to reflect the documented
behaviour from the design.gitlab.com docs:
https://design.gitlab.com/regions/navigation#contextual-navigation
Updated rspec tests to reflect the expected behaviour
|
|
Adds the collapsed mixin to the styling for .nav-sidebar
ensuring the nav-sidebar is collapsed on load via media
queries. Removes the need for an intermediate class to
collapse the sidebar on mobile viewports
Updated toggleCollapsedSidebar to check for desktop breakpoint
|
|
Adds rspec view tests that expect the nav sidebar
to have a class that will cause the nav sidebar
to be rendered collapsed with or without js.
Tests the nav sidebar on the admin, group,
instance statistics, user profile and project
sidebars.
|
|
* Add email_header_and_footer_enabled flag to appearances table
* Set email_header_and_footer_enabled default value to false
* Add checkbox to appearance to toggle show header and footer in emails
* Add email_header_and_footer_enabled to allowed params in controller
* Add header and footer messages to the html and text email layouts
* Remove the color styling for emails header and footer
* Add empty_mailer layout for emails without layout,
to have the header and footer applied
|
|
This reverts commit f5201a816f2eff9393e16f362403451e5d86ee6c, reversing
changes made to 48e6db0dad6f256e8423e0bd6c9b254803f50ccf.
|
|
|
|
into 'master'"
This reverts merge request !25293
|
