| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| | |
Add documentation on relative URL support
closes #12773
See merge request !2770
|
| |
| |
| |
| | |
[ci skip]
|
|\ \
| | |
| | |
| | |
| | | |
Freeze constants in Gitlab::Git
See merge request !1730
|
| | |
| | |
| | |
| | | |
Also remove the spec for it
|
| |/ |
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | | |
# 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
|
| | |_|/
| |/| | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow limited Markdown in Broadcast Messages
Closes #11853
See merge request !2695
|
| |/ / /
| | | |
| | | |
| | | | |
Closes #11853
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Increase project import timeout from 4 minutes to 15 minutes
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
## Import screenshot

See merge request !2717
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
|
|\ \ \ \ |
|
| | | | | |
|
| |/ / / |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix timeout issue for rake task gitlab:backup:create
This is a fix for a database timeout which can occur when the backup
create task is taking very long (1-2 hours).
It seems that ActiveRecord is loosing the connection after a hour
idleness and need to be reconnected before use.
See merge request !2757
|
| |/ / / |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
'master'
Fix CurrentSettings autoload bug in development
_Originally opened at !2526 by @huacnlee._
- - -
In development env, when we changed any file hit Rails reload, it will failed with this message:
```
A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
```
See merge request !2753
|
| |/ / /
| | | |
| | | |
| | | | |
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixed init.d script not working on OS X
-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
Fixes Issue #3309
See merge request !1728
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
-s flag of su doesn't work correctly on some systems, loging in the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
|
|/ / /
| | |
| | |
| | | |
gitlab_workhorse_dir
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix atom url issue on projects
This MR adds prevents a project to have a path ending in .atom that conflicts with the feed
and
Adds a migration to migrate old .atom projects to a different path
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699
See merge request !2651
|
| | | | |
|
| |\ \ \ |
|
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | | | |
|
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Closes #12900
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This allows for future pipelines to more easily define a custom
whitelist.
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.
Closes #5612
See merge request !2266
|
| | | | | |
|
| | | | | |
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.
Closes #5612
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Consistent rails_socket use.
[ci skip]
See merge request !2596
|
| | | | | |
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Send raw Git blobs via gitlab-workhorse
See merge request !2451
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | | |
git-raw-workhorse
|
| | | | | | |
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix add_pagination_headers to keep request parameters in Link header
Originally opened at !2321. Closes #5904. /cc @Michi302
See merge request !2674
|
| | |_|/ / /
| |/| | | | |
|