Age | Commit message (Collapse) | Author |
|
Create an issue for all unresolved discussions in an MR
See merge request !7180
|
|
GLM shorthand reference for projects from the same namespace
Closes #21679
See merge request !7255
|
|
Document the public Project API and document `GET /projects/:id/users`
Documentation was not updated in !7843. Also the `GET /projects/:id/users` endpoint was not documented at all!
See merge request !7897
|
|
NIGNX -> Nginx
This shouldn't be in all caps, and it should be spelled correctly!
See merge request !7929
|
|
[ci skip]
|
|
Refactor CI variables docs
See merge request !7751
|
|
[ci skip]
|
|
Describe hover, focus and active states for primary and secondary
buttons.
Organized the icons section in a table. Replaced images for icons
so they are all the same size.
Organized the color section in a table. Replaced the images with
new ones so the table would have a more manageable size. Updated
the values for some colors to show the $color-light shade.
Remove commented sections
Remove `db/schema.rb`
Add db/schema.rb from origin/master
Fix typos
|
|
When a merge request can only be merged when all discussions are
resolved. This feature allows to easily delegate those discussions to a
new issue, while marking them as resolved in the merge request.
The user is presented with a new issue, prepared with mentions of all
unresolved discussions, including the first unresolved note of the
discussion, time and link to the note.
When the issue is created, the discussions in the merge request will get
a system note directing the user to the newly created issue.
|
|
This shouldn't be in all caps, and it should be spelled correctly!
|
|
Bump ruby version to 2.3.3
Part of gitlab-org/gitlab-ce#24629
See merge request !7904
|
|
Rename MWBS service to Merge When Pipeline Succeeds
## What does this MR do?
This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
## What are the relevant issue numbers?
Closes #23354
See merge request !7135
|
|
Fix gfm doc typo about two spaces for next line transfer
Fixes #25148
See merge request !7915
|
|
API: Expose committer details for a commit
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312
See merge request !7849
|
|
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Extend code review docs with chapter about the right balance
[ci skip]
See merge request !7838
|
|
[ci skip]
|
|
'master'
Don't allow to specify a repo or version when installing Workhorse
I've also updated the "patch version upgrade" doc since I did forget to update it in !6574.
See merge request !7879
|
|
Resolve "User-generated permalink IDs collide with GitLab interface"
## What does this MR do?
Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM.
How this works:
* All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"`
* All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>`
* When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead.
## Before
![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif)
## After:
![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif)
![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22781
See also prior attempts to address this issue:
#3908, !2023, !2024
See merge request !7631
|
|
The task will use the canonical repo and the required version.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Document the need to use a PAT with Registry when 2FA is on
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465
See merge request !7874
|
|
GitLab 8.12 introduced a new permissions model which tightened the
security of Container Registry. It is now required to use a personal
token if 2FA is enabled.
[ci skip]
|
|
[ci skip]
|
|
Clarify that a commit SHA doesn't work for CI triggers
Related https://gitlab.com/gitlab-org/gitlab-ce/issues/22029
See merge request !7871
|
|
[ci skip]
|
|
Fix wrong link in builds artifacts admin docs
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23168
See merge request !7870
|
|
[ci skip]
|
|
|
|
[ci skip]
|
|
23718/backup rake task human readable
## What does this MR do?
Add the human readable format to the backup tar file.
From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
#23718 issue
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
23718
See merge request !7188
|
|
'22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master'
New `gitlab:workhorse:install` rake task
## Why was this MR needed?
Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57
Closes #22719
See merge request !6574
|
|
|
|
Refactor the Git submodules with CI docs
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567
See merge request !7856
|
|
[ci skip]
|
|
API: Expose branch status
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938
See merge request !7796
|
|
Grapify the files API
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928
See merge request !7806
|
|
|
|
|
|
Grapify the projects API
Related to #22928
See merge request !7456
|
|
* master: (110 commits)
Rewrite an HTTP link to use HTTPS
Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac
Add blue back to sub nav active
Remove JSX/React eslint plugins.
Fix a transient spec failure
Adds hoverstates for collapsed Issue/Merge Request sidebar
Moved groups above projects
Add StackProf to the Gemfile, along with a utility to get a profile for a spec
Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
Add a CHANGELOG entry
Alert user when logged in user email is not the same as the invitation
Expose timestamp in build entity used by serializer
Rename `MergeRequest#pipeline` to `head_pipeline`
Remove unnecessary database indexes
CE-specific changes gitlab-org/gitlab-ee#1137
Fixing typo & Clarifying Key name
fix started_at check
fix blob controller spec failure - updated not to use file-path-
fix blob controller spec failure
Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'
...
Conflicts:
app/controllers/projects/merge_requests_controller.rb
lib/api/merge_requests.rb
spec/requests/api/merge_requests_spec.rb
|
|
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>
|
|
Add StackProf to the Gemfile, along with a utility to get a profile for a spec
The test suite needs speeding up significantly. This is one tool for investigating it.
Related to #23034
See merge request !7784
|