Dmitriy Zaporozhets
a52529f9b6
Merge branch 'bitbucket-import'
...
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
2015-02-25 09:21:45 -08:00
Douwe Maan
3fde1dce1f
Satisfy Rubocop.
2015-02-24 15:07:25 +01:00
Douwe Maan
6979b3afd5
Delete deploy key from Bitbucket after importing.
2015-02-24 15:07:24 +01:00
Douwe Maan
f2b37de54b
Fix specs.
2015-02-24 15:07:24 +01:00
Douwe Maan
448817c4de
Load public key in initializer.
2015-02-24 15:07:24 +01:00
Douwe Maan
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
Valery Sizov
71a844cdae
Web Editor: save to new branch
2015-02-24 11:43:20 +02:00
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
d723bf78b8
Fix git-over-http
2015-02-23 10:05:18 -08:00
Vinnie Okada
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
Vinnie Okada
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
Dmitriy Zaporozhets
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
Marin Jankovski
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
Dmitriy Zaporozhets
acc312fc25
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-20 13:54:21 -08:00
Dmitriy Zaporozhets
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
Marcin Kulik
157b4b4b1f
Add gitorious.org importer
2015-02-20 17:42:58 +00:00
Douwe Maan
938a1381fc
Satisfy Rubocop.
2015-02-20 16:04:03 +01:00
Douwe Maan
4310431ee7
Use modified ActionDispatch::Static to let uploads go through to routes.
2015-02-20 12:44:07 +01:00
Douwe Maan
0632e85c82
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
2015-02-20 10:23:34 +01:00
Vinnie Okada
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
Dmitriy Zaporozhets
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
Douwe Maan
3d6b042e9e
Fix push access check when not signed in.
2015-02-18 21:59:15 +01:00
Dmitriy Zaporozhets
a8a328b151
DB performance improvements to GitLab
2015-02-18 00:16:42 -08:00
Vinnie Okada
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
Douwe Maan
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
Dmitriy Zaporozhets
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
Douwe Maan
6685661b54
Clean username acquired from OAuth/LDAP.
...
Fixes #1967 .
2015-02-12 21:05:27 +01:00
Marin Jankovski
29e606deec
Add ExternalIssue base model to make issue referencing more robust for external issue trackers.
2015-02-11 09:21:57 -08:00
Nikita Verkhovin
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets
89f8020fe1
Merge branch 'mention-groups'
...
Conflicts:
CHANGELOG
2015-02-06 16:45:37 -08:00
Valery Sizov
b3c90dd514
GitHub importer refactoring
2015-02-05 21:48:21 -08:00
Valery Sizov
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
Valery Sizov
93585661b1
code folding
2015-02-05 12:50:34 -08:00
Valery Sizov
33349dd549
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Valery Sizov
18231b0bb3
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Valery Sizov
7ddba92a39
Gitlab integration: added tests
2015-02-05 12:50:34 -08:00
Valery Sizov
5194214e3a
GitLab integration. Importer
2015-02-05 12:50:34 -08:00
Douwe Maan
9910b7ff99
Allow groups to be mentioned.
...
Resolves #1673 .
2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets
490cf7bfce
Improve protected branches selectbox options
2015-02-03 18:12:20 -08:00
Dmitriy Zaporozhets
635ebac606
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets
61cc6a9244
Rubocop: indentation fixes Yay!!!
2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets
d04344373b
Rubocop: no trailing newlines
2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets
7d48205c1a
Rubocop: comment indentation
2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets
c427bf08e4
Rubocop: Style/AlignArray enabled
2015-02-02 20:58:28 -08:00
Dmitriy Zaporozhets
e890582681
Rubocop enabled for: Use spaces inside hash literal braces
2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets
4f1d1fc51b
Convert hashes to ruby 1.9 style
2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets
f1cf49218f
Improve contribution calendar on user page
...
* cache user contributions for day
* ignore forks in calendar contribtuions
2015-01-29 17:07:44 -08:00
Marco Wessel
20e269cb92
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
...
Conflicts:
CHANGELOG
db/schema.rb
2015-01-30 00:16:24 +01:00
Dmitriy Zaporozhets
ca701a9649
Improvements to LDAP::User model
...
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
2015-01-29 13:28:41 -08:00
Dmitriy Zaporozhets
Douwe Maan
Valery Sizov
Dmitriy Zaporozhets
Vinnie Okada
Marin Jankovski
Marcin Kulik
Marin Jankovski
Nikita Verkhovin
Valery Sizov
Marco Wessel
