| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Redirect /import to project page if no importing at all and repo exists
Fixes gitlab-org/gitlab-ce#13367.
See merge request !2857
|
| | |
| |
| |
| | |
Fixes #13367.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Handle nil commits in Gitlab::PushDataBuilder.build
Closes #13469
See merge request !2825
|
| | | |
| | |
| | |
| | | |
Closes #13469
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
This ensures the caches for Repository#empty? and
Repository#has_visible_content? are flushed after a repository has been
imported or forked.
Fixes gitlab-org/gitlab-ce#13505
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new data to project in push, issue, merge-request and note webhooks data
_Originally opened at !2738 by @bugagazavr._
- - -
**What does this MR do?**
Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks )
**Are there points in the code the reviewer needs to double check?**
1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738
2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132
3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52
4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56
**Why was this MR needed?**
More information about user for push events, and more data about repositiry ( project )
**What are the relevant issue numbers?**
No
**Screenshots (if relevant)**
No
See merge request !2788
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
`path_with_namespace` and `default_branch` in `project` in push, issue,
merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
favor of `git_http_url` in `project` for push, issue, merge-request and
note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
note webhooks data, use `project` instead
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix cross reference notes on forks
Updates `cross_reference_exists?` to match on commit only.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5849
See merge request !2731
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
problem and updated spec
|
| | |\ \ \
| | | | |
| | | | |
| | | | | |
fix/cross-reference-notes-forks
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
fix/cross-reference-notes-forks
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
fix/cross-reference-notes-forks
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Ensure Commit#show responds 404 instead of 500 when given an invalid ID
Closes #13467
See merge request !2823
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | | |
Closes #13467
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix broken link in CI build notification emails
Closes #13199
See merge request !2785
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This also extracts shared examples for notification emails to separate
file.
|
| | | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | | |
Closes #13199
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- Apply the RelativeLinkFilter filter to other formats, e.g.,
reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline
Fixes #3533.
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Validate email addresses using Devise.email_regexp
Also:
- Get rid of legacy `:strict_mode`
- Get rid of custom `:email` validator
- Add some shared examples to spec emails validation
This supersedes !2754 and fixes #3851.
See merge request !2771
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also:
- Get rid of legacy :strict_mode
- Get rid of custom :email validator
- Add some shared examples to spec emails validation
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
'master'
API: Allow to set or update a merge-request's milestone
_Originally opened at !2107 by @ skakirill._
- - -
See merge request !2755
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into 'master'
Add merge_requests/:merge_request_id/closes_issues
_Originally opened at !2660 by @Schniz._
- - -
Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully
See merge request !2779
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
API specs
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
route in the API
Added some documentation for it
Added to changelog
Added curl example and an attribute table
Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"
Fixed the attributes and changed the documentation to be at "merge_requests.md" too
Changed generic titles to more specific titles
added an underscore
added tests. it depends on a newer version of gitlab-test project
I'm doing a since I need to add a branch to the `gitlab-test` repo
removed the before
using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass
Removed the 'closes-issues' key from test_env. so it should pass the tests
Moved the two initializations to the describe block
Changed the changelog
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
'master'
Add assignee data to Issuables' hook_data
Originally opened at !1633 by @brammeleman.
Fixes #3047. Fixes #2475.
See merge request !2724
|
| | | |_|_|_|_|/
| |/| | | | | |
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Actually use the `skip_merges` option in Repository#commits
Originally opened at !2067 by @cwq1913.
See merge request !2750
|
| | |/ / / / / |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Smarter flushing of branch statistics caches
This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details.
cc @joshfng @rspeicher
See merge request !2769
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Instead of flushing the behind/ahead counts for all branches upon every
push we now only flush the cache of branches that actually need to have
these statistics recalculated. There are now basically 2 scenarios and
their effects:
1. A user pushes a commit to the default branch, this results in the
cache being flushed for all branches.
2. A user pushes to a non default branch, this results in _only_ the
cache for that branch being flushed.
The existing code (Repository#expire_cache) remains backwards compatible
with the previous behaviour, the new behaviour is only applied when a
branch name is passed as an argument. This ensures that when for example
a project is deleted the cache for all branches is flushed.
|
| |\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Limit guest access to builds
Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646
See merge request !1942
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
# Conflicts:
# db/schema.rb
|
| | | |\ \ \ \ \ \
| | | | |_|_|/ /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
# Conflicts:
# app/views/projects/builds/index.html.haml
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API
Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Expose MergeRequest#merge_status
_Originally opened at !2478 by @develop7._
- - -
This enables API users to see whether a merge request can be merged without conflicts.
See merge request !2756
|
| | | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
resource
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
`max_attachment_size` in `ApplicationSetting` should be present,
only integers greater than zero are valid.
Closes #13188
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'
Add option to include the sender name in body of Notify email
_Originally opened at !2495 by @huacnlee._
- - -
Fixes #7824.
See merge request !2767
|
| | |/ / / / / / / |
|
