| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Subscription to issue/mr
Fixes #1911 and #1909
See merge request !1702
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| |
|
|
|
|
|
| |
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
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/
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make test element selection more specific to fix constantly failing test.
Fixes #2051.
The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist:
> The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element.
This caused the test to fail.
See merge request !1592
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
# 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/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
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
|
| | |/
|/| |
|
| | | |
|
| | |
| |
| |
| | |
This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make sure Markdown previews always use the same styling as the eventual destination.
Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.
See merge request !1514
|
| | |/
| |
| |
| | |
destination.
|
| |/
|
|
|
|
|
|
|
|
|
| |
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
|
| |
|
|
| |
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
| |\
| |
| | |
Add Asana service
|
| | |
| |
| |
| | |
And add restrict_to_branch to spec
|
| | |
| |
| |
| | |
Also add ability to render "service.help" in markdown
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Add tests for creating bare repo and first file in UI
Part of #1930
See merge request !1444
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| | |
Move external issue tracker away from yml config
See merge request !1442
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
|
| | | | |
|
| | |/
|/| |
|
| | | |
|
| | |
| |
| |
| | |
feature mergable
|
| |/
|
|
| |
avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
|
| | |
|
| | |
|
| |\
| |
| | |
Add tests for disabled blob edit button cases v2
|
| | | |
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |/
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| | |
Teamcity integration using 8.1 rest api
|
| | | |
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Project path
Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763
See merge request !1337
|
| | |/
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |/
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
