| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| | |
Extract merge quick action to a shared example
Closes #59570
See merge request gitlab-org/gitlab-ce!26925
|
| | |
|
|/
|
|
| |
Also removes specs related to the flag
|
|\
| |
| |
| | |
jarv/dev-to-gitlab-2019-04-02
|
| |\
| | |
| | |
| | |
| | | |
Fix XSS in resolve conflicts form
See merge request gitlab/gitlabhq!2977
|
| | |
| | |
| | |
| | |
| | |
| | | |
The issue arose when the branch name contained Vue template
JavaScript. The fix is to use `v-pre` which disables Vue
compilation in a template.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Extend quick actions dsl to allow specifying model types
to which given quick action applies
* Rename issuable attribute to noteable in interpret_service.rb
* Refactor and reorder quick action specs
* Create a shared example spec for each quick action to be used for
issue, merge request and commit specs.
https://gitlab.com/gitlab-org/gitlab-ce/issues/50199
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before, the styling for `img:not(.emoji)`` was repeated between
`.md:not(.use-csslab):not(.wiki)` (for comments and the Markdown
preview), `.documentation.wiki` (for help pages), and
`.issuable-details .description .wiki` (for MR and issue descriptions).
In these places, we now simply use `.md`. Wherever we use `.md` but
don't want this image styling (like wikis and blobs), `.md-file` is
added.
|
|/ /
| |
| |
| | |
Makes discussion expansion depend on `discussion.expanded`
|
| |
| |
| |
| |
| |
| | |
This commit updates the pipeline block that appears on the merge request
page to include information that will be exposed by the API as part of
the post-merge pipeline feature.
|
| |
| |
| |
| |
| | |
This commit updates the pipeline page and related components to include
new pipeline information added by the post-merge pipeline feature.
|
| |
| |
| |
| | |
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Enable reply_to_individual_notes feature flag by default
Closes #30299
See merge request gitlab-org/gitlab-ce!25575
|
| |/ |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Expand diff to entire file
Closes #19054
See merge request gitlab-org/gitlab-ce!24406
|
| |
| |
| |
| |
| |
| | |
The user can also toggle between the diff changes and
the full file diff.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
|
|\ \
| |/
|/| |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix
ok
Add spec
Fix
ok
Fix
Add changelog
Fix
Add memoization
a
fix
|
|\ \
| | |
| | |
| | |
| | | |
Use Web IDE path for merge request edit buttons
See merge request gitlab-org/gitlab-ce!25595
|
| |/ |
|
|/
|
|
| |
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
|
|
|
|
|
|
| |
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
|
|
|
|
| |
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
'52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master'
Resolve "Lines changed statistics is not easily visible in MR changes view"
Closes #52347
See merge request gitlab-org/gitlab-ce!24569
|
| |
| |
| |
| |
| | |
Put the statistics in the compare-versions header for the entire MR
Put them in the file header for each individual file
|
|/ |
|
|\
| |
| |
| |
| |
| |
| | |
Added dropdown for diff settings
Closes #55491
See merge request gitlab-org/gitlab-ce!24460
|
| |
| |
| |
| |
| |
| |
| | |
Dropdown includes buttons for tree view rendering mode
and buttons for the compare view (inline or side-by-side)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Resolve "Commit comments displayed on a merge request that contains that commit no longer specify which commit they come from"
Closes #53950
See merge request gitlab-org/gitlab-ce!24427
|
| | |
| | |
| | |
| | |
| | |
| | | |
- Added missing i18n strings
- Added changelog entry
- Fixed lint errors
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
|
| | |
| | |
| | |
| | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
'25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"
Closes #25569
See merge request gitlab-org/gitlab-ce!23966
|
| | |
| | |
| | |
| | | |
This is to match `git branch -D <branchname>`
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
The expansion hover animation caused a number of layout headaches; this
commit removes the animation and replaces them with hover/active/focus
styles.
Related issue:
https://gitlab.com/gitlab-org/gitlab-ce/issues/42769
|
|/
|
|
| |
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9206
|
|
|
|
|
|
|
|
|
|
|
| |
These are data columns that store runtime configuration
of build needed to execute it on runner and within pipeline.
The definition of this data is that once used, and when no longer
needed (due to retry capability) they can be freely removed.
They use `jsonb` on PostgreSQL, and `text` on MySQL (due to lacking
support for json datatype on old enough version).
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
[master] Validate projects in MR build service
See merge request gitlab/gitlabhq!2678
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This validates the correct abilities for both projects. Only
`read_project` isn't enough:
For the `source_project` we validate `create_merge_request_from` this
also validates that the user has developer access to the project.
For the `target_project` we validate `create_merge_reqeust_in` this
also validates that the user has access to the project's repository.
To avoid generating diffs for unrelated projects we also validate that
the projects are in the same fork network now.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011
in GitLab 11.1 refactored the merge request diff comparison
functionality but omitted the commit SHA due to a change in
the API (truncated_commit_sha -> short_commit_sha).
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.
It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
|
| |
| |
| | |
This reverts merge request !23622
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When this spec is run in a certain order, there appeared to be a timing
issue with opening the "Merge when pipeline succeeds" drop-down menu. We
now explicitly wait for any pending requests to complete before clicking
the drop-down.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6770
|