summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Satisfy Rubocop.Douwe Maan2015-02-241-2/+2
| | | | | | |
| | * | | | | Delete deploy key from Bitbucket after importing.Douwe Maan2015-02-243-6/+38
| | | | | | |
| | * | | | | Fix specs.Douwe Maan2015-02-241-1/+1
| | | | | | |
| | * | | | | Load public key in initializer.Douwe Maan2015-02-242-3/+12
| | | | | | |
| | * | | | | Add Bitbucket importer.Douwe Maan2015-02-249-15/+208
| | |/ / / /
| * | | | | Web Editor: save to new branchValery Sizov2015-02-242-4/+12
| |/ / / /
| * | | | Merge branch 'api-empty-commit' into 'master'Dmitriy Zaporozhets2015-02-243-7/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Improve error messages when file editing failsVinnie Okada2015-02-223-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give more specific errors in API responses and web UI flash messages when a file update fails.
| * | | | | Fix git-over-httpDmitriy Zaporozhets2015-02-231-0/+1
| |/ / / /
| * | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-217-3/+184
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge branch 'mr-commit-comment-diff-lines' into 'master'Dmitriy Zaporozhets2015-02-211-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: ![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png) After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered. See merge request !1552
| | | * | | Fix commit comments on first line of diff not rendering in Merge Request ↵Douwe Maan2015-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Discussion view.
| | * | | | Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq ↵Marin Jankovski2015-02-202-0/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mattes-go-get-workaround-nginx Conflicts: lib/support/nginx/gitlab lib/support/nginx/gitlab-ssl
| | | * | | | remove optional html tagsmattes2014-12-312-12/+2
| | | | | | |
| | | * | | | allow for private repositoriesmattes2014-12-312-0/+30
| | | | | | |
| | * | | | | Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-203-2/+58
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Restore nginx config a little more.Douwe Maan2015-02-202-0/+2
| | | | | | | |
| | | * | | | | Make changes to nginx config less likely to break something.Douwe Maan2015-02-202-35/+66
| | | | | | | |
| | | * | | | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
| | | | | | | |
| | | * | | | | Use modified ActionDispatch::Static to let uploads go through to routes.Douwe Maan2015-02-201-0/+13
| | | | | | | |
| | | * | | | | Modify nginx config to let /uploads go through to unicorn.Douwe Maan2015-02-202-37/+47
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-202-0/+102
| | |\ \ \ \ \
| | | * | | | | Add gitorious.org importerMarcin Kulik2015-02-202-0/+102
| | | |/ / / /
| | * | | | | Extend project web hooks with more dataDmitriy Zaporozhets2015-02-201-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-196-10/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-192-29/+13
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
| | * | | | Merge branch 'access-check-when-signed-out' into 'master'Dmitriy Zaporozhets2015-02-181-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | Fix push access check when not signed in.Douwe Maan2015-02-181-0/+2
| | | | | | |
| | * | | | | Improve broadcast message APIDmitriy Zaporozhets2015-02-182-2/+4
| | | | | | |
| | * | | | | Dont send 404 if no broadcast messages now because it flood gitlab-shell ↵Dmitriy Zaporozhets2015-02-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | logs with 404 errors :(
| | * | | | | DB performance improvements to GitLabDmitriy Zaporozhets2015-02-181-5/+9
| | |/ / / /
| | * | | | Remove Group#owner_id from API since it is not used any moreDmitriy Zaporozhets2015-02-172-2/+2
| | | | | |
| | * | | | Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-162-13/+29
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-143-10/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | 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.
| * | | Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan2015-02-131-5/+6
| | | | | | | | | | | | | | | | Git over HTTP(S).
| * | | Merge branch 'clean-oauth-username' into 'master'Dmitriy Zaporozhets2015-02-131-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean username acquired from OAuth/LDAP. Fixes #1967. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813 See merge request !1500
| | * | | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-121-5/+5
| | | | | | | | | | | | | | | | | | | | Fixes #1967.
| * | | | Merge branch 'issues_tracker_template' into 'master'Dmitriy Zaporozhets2015-02-121-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues trackers template If admin defines service template, service in project will be prefilled with the template data. See merge request !1503
| | * | | | Add ExternalIssue base model to make issue referencing more robust for ↵Marin Jankovski2015-02-111-1/+1
| | |/ / / | | | | | | | | | | | | | | | external issue trackers.
| * | | | Edit group members via APIVinnie Okada2015-02-113-10/+31
| |/ / / | | | | | | | | | | | | | | | | Add an API endpoint to update the access level of an existing group member.
| * | | Merge branch 'add_label_notes' into 'master'Dmitriy Zaporozhets2015-02-112-4/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add label notes It creates system note, when someone changed labels of issue/MR. Just look at the screenshot: ![labels](https://gitlab.com/uploads/vernik91/gitlab-ce/ebbdba6bdc/labels.png) 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 :wink:. But I need this feature as soon as possible.* See merge request !331
| | * | | Add labels notesNikita Verkhovin2015-02-082-4/+25
| | | | |
| * | | | Add internal broadcast message API.Douwe Maan2015-02-072-0/+12
| |/ / /
| * | | Merge branch 'mention-groups'Dmitriy Zaporozhets2015-02-061-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG
| | * | | Allow groups to be mentioned.Douwe Maan2015-02-051-2/+9
| | | | | | | | | | | | | | | | | | | | Resolves #1673.
| * | | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-064-60/+72
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Refactor and improve sorting objects in API for projects, issues and merge ↵Dmitriy Zaporozhets2015-02-054-58/+72
| | | | | | | | | | | | | | | | | | | | | | | | requests
| | * | | | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-2/+0
| | | | | |
| * | | | | GitHub importer refactoringValery Sizov2015-02-052-10/+32
| | | | | |
| * | | | | gitlab.com importer: refactorigValery Sizov2015-02-052-2/+3
| | | | | |
View Lorry Controller Status