| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
1) Adds a DB migration for all services to toggle on push, issue, and merge events.
2) Upon an issue or merge request event, fire service hooks.
3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.
4) Label merge request hooks with their corresponding actions.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Reduce amount of sql queries on dashboard projects page
For https://github.com/gitlabhq/gitlabhq/issues/7218
See merge request !1613
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Aorimn-add-irker-service
Conflicts:
app/controllers/projects/services_controller.rb
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.
See http://www.catb.org/esr/irker/
|
|/ |
|
|\
| |
| |
| |
| |
| | |
Update project_milestone_path update route.
See merge request !1605
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix GitLab && Gitorious importers. Hide already imported projects
Fixes #2060
See merge request !1594
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Generalizes image upload in drag and drop in markdown to all files
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.
- [x] Rebase on master when !1553 is merged in
See merge request !1530
|
| |\ \
| | |/
| | |
| | |
| | | |
# Conflicts:
# app/controllers/files_controller.rb
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
|
| |\ \ \ |
|
| | | | | |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
|
| | | | | | |
|
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
|
| | | | | | |
|
| | | | | | |
|
| | |_|_|/
| |/| | | |
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix 404 when deleting a project from the admin section
This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing.
See merge request !351
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The deletion from the admin section was redirecting to the wrong address.
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Improve contributed project and commit calendar selection.
Fixes #2024.
See merge request !1554
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Web Editor: save to new branch
Implements #1931
See merge request !1523
|
| | |_|/ / / /
| |/| | | | | |
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | | |
access
|
| |/ / / /
|/| | | | |
|
| | | | | |
|
|\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Redirect from /tree/master on empty repo instead of showing 404.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114
See merge request !1559
|
| | |/ / /
| | | | |
| | | | |
| | | | | |
doesn't 404.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix note attachments XSS and access control
Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.
@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?
See merge request !1553
|
| | | |/ /
| | |/| | |
|
| | |/ / |
|
| |/ / |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
|
| | |
| | |
| | |
| | | |
This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
|
| | |
| | |
| | |
| | | |
This reverts commit ebd39fc082b09177e0777e5de5729c3f98495e87.
|