0d22b75b03
Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm
...
Conflicts:
lib/api/users.rb
2015-02-27 13:01:57 -08:00
a52529f9b6
Merge branch 'bitbucket-import'
...
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
2015-02-25 09:21:45 -08:00
3fde1dce1f
Satisfy Rubocop.
2015-02-24 15:07:25 +01:00
6979b3afd5
Delete deploy key from Bitbucket after importing.
2015-02-24 15:07:24 +01:00
f2b37de54b
Fix specs.
2015-02-24 15:07:24 +01:00
448817c4de
Load public key in initializer.
2015-02-24 15:07:24 +01:00
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
71a844cdae
Web Editor: save to new branch
2015-02-24 11:43:20 +02:00
c87c1cb3b9
Merge branch 'api-empty-commit' into 'master'
...
Improve error messages when file editing fails
Give more specific errors in API responses and web UI flash messages when a file update fails. See #1479 .
Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push.
@dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService`
cc @sytse
See merge request !1569
2015-02-24 02:17:23 +00:00
d723bf78b8
Fix git-over-http
2015-02-23 10:05:18 -08:00
5f232b5687
Improve error messages when file editing fails
...
Give more specific errors in API responses and web UI flash messages
when a file update fails.
2015-02-22 16:01:49 -07:00
2a9eed6620
Merge branch 'master' into rails-4.1.9
...
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
2015-02-21 12:55:28 -07:00
a224a655d8
Merge branch 'mr-commit-comment-diff-lines' into 'master'
...
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
Example can be seen near the bottom on this MR: !1533 .
Before:
After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449 ) is actually rendered.
See merge request !1552
2015-02-21 02:06:39 +00:00
51349ca3c8
Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx
...
Conflicts:
lib/support/nginx/gitlab
lib/support/nginx/gitlab-ssl
2015-02-20 15:47:34 -08:00
8ae3112b3f
Merge branch 'upload-xss-access-control' into 'master'
...
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
2015-02-20 22:47:54 +00:00
26d57a648c
Restore nginx config a little more.
2015-02-20 23:32:39 +01:00
08874d2b51
Make changes to nginx config less likely to break something.
2015-02-20 23:27:17 +01:00
acc312fc25
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-20 13:54:21 -08:00
92434b29cc
Extend project web hooks with more data
...
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
2015-02-20 10:27:37 -08:00
157b4b4b1f
Add gitorious.org importer
2015-02-20 17:42:58 +00:00
938a1381fc
Satisfy Rubocop.
2015-02-20 16:04:03 +01:00
4310431ee7
Use modified ActionDispatch::Static to let uploads go through to routes.
2015-02-20 12:44:07 +01:00
eb210f4a18
Modify nginx config to let /uploads go through to unicorn.
2015-02-20 12:22:53 +01:00
0632e85c82
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
2015-02-20 10:23:34 +01:00
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
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
2015-02-19 20:53:05 -07:00
8184a65644
Revert "Fix broken access control and refactor avatar upload"
...
This reverts commit 7d5f86f6cb
2015-02-19 08:57:35 -08:00
7ad5fd6ce7
Merge branch 'access-check-when-signed-out' into 'master'
...
Fix push access check when not signed in.
Was causing 500 on MR, Blob, Tree pages.
Fixes https://github.com/gitlabhq/gitlabhq/issues/8637 and https://github.com/gitlabhq/gitlabhq/issues/8813 .
See merge request !1542
2015-02-18 23:24:06 +00:00
558dd81197
Improve broadcast message API
2015-02-18 14:58:20 -08:00
833d4dddf2
Dont send 404 if no broadcast messages now because it flood gitlab-shell logs with 404 errors :(
2015-02-18 14:34:05 -08:00
3d6b042e9e
Fix push access check when not signed in.
2015-02-18 21:59:15 +01:00
a8a328b151
DB performance improvements to GitLab
2015-02-18 00:16:42 -08:00
24d939afb9
Remove Group#owner_id from API since it is not used any more
2015-02-17 16:23:44 -08:00
7d5f86f6cb
Fix broken access control and refactor avatar upload
...
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.
2015-02-16 20:10:15 +01:00
76aad9b76e
Upgrade to Rails 4.1.9
...
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.
2015-02-14 11:09:23 -07:00
25e44d0530
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
2015-02-13 14:44:42 +01:00
2ff1b8e68d
Merge branch 'clean-oauth-username' into 'master'
...
Clean username acquired from OAuth/LDAP.
Fixes #1967 .
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813
See merge request !1500
2015-02-13 00:39:34 +00:00
6685661b54
Clean username acquired from OAuth/LDAP.
...
Fixes #1967 .
2015-02-12 21:05:27 +01:00
714ca5189e
Merge branch 'issues_tracker_template' into 'master'
...
Issues trackers template
If admin defines service template, service in project will be prefilled with the template data.
See merge request !1503
2015-02-12 20:02:23 +00:00
b0dacc8eb0
Edit group members via API
...
Add an API endpoint to update the access level of an existing group
member.
2015-02-11 18:53:07 -07:00
29e606deec
Add ExternalIssue base model to make issue referencing more robust for external issue trackers.
2015-02-11 09:21:57 -08:00
3c4f7f50fa
Merge branch 'add_label_notes' into 'master'
...
Add label notes
It creates system note, when someone changed labels of issue/MR.
Just look at the screenshot:
Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change ).
*P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237 ) for idea 😉 . But I need this feature as soon as possible.*
See merge request !331
2015-02-11 01:34:33 +00:00
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
42422dcc6a
Add internal broadcast message API.
2015-02-07 16:41:30 +01:00
89f8020fe1
Merge branch 'mention-groups'
...
Conflicts:
CHANGELOG
2015-02-06 16:45:37 -08:00
dd8dd92e50
Merge branch 'api-default-order' into 'master'
...
Sorting refactoring
* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope
See merge request !1476
2015-02-06 18:08:44 +00:00
bdfb349ff7
Refactor and improve sorting objects in API for projects, issues and merge requests
2015-02-05 22:00:54 -08:00
b3c90dd514
GitHub importer refactoring
2015-02-05 21:48:21 -08:00
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
62ed1c537e
Explicitly define ordering in models using default_scope
2015-02-05 14:20:55 -08:00
93585661b1
code folding
2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets
