Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2016-02-16Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan
Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
2016-02-15Fix undefined method `postgresql?` during migrationRobert Speicher
2016-02-12Fix relative links in other markup formatsBen Boeckel
- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
2016-02-12Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵Douwe Maan
'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
2016-02-12Load all blob data when highlighting content for git-blame.Rubén Dávila
2016-02-11Merge branch 'remove_sqlite_check' into 'master' Jeroen van Baarsen
Remove sqlite check in raketask This is a relic from 4 major releases ago. Time to remove it. See merge request !2777
2016-02-11Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵Rémy Coutable
into 'master' Add merge_requests/:merge_request_id/closes_issues _Originally opened at !2660 by @Schniz._ - - - Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully See merge request !2779
2016-02-11Add new data to project in push, issue, merge-request and note webhooks dataKirill Zaitsev
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
2016-02-11Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Rémy Coutable
API specs
2016-02-11Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵Gal Schlezinger
route in the API Added some documentation for it Added to changelog Added curl example and an attribute table Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb" Fixed the attributes and changed the documentation to be at "merge_requests.md" too Changed generic titles to more specific titles added an underscore added tests. it depends on a newer version of gitlab-test project I'm doing a since I need to add a branch to the `gitlab-test` repo removed the before using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass Removed the 'closes-issues' key from test_env. so it should pass the tests Moved the two initializations to the describe block Changed the changelog
2016-02-10Remove sqlite check in raketaskAchilleas Pipinellis
2016-02-10Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis
Add documentation on relative URL support closes #12773 See merge request !2770
2016-02-09Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher
Freeze constants in Gitlab::Git See merge request !1730
2016-02-09Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher
2016-02-09Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan
Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756
2016-02-09Edit configuration files for relative URL supportAchilleas Pipinellis
[ci skip]
2016-02-09Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan
Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
2016-02-09Merge branch 'increase_import_timeout' into 'master' Douwe Maan
Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
2016-02-09Merge branch 'snippet_search_refactoring'Valery Sizov
2016-02-09Merge branch 'backup-database-timeout-fix' into 'master' Robert Speicher
Fix timeout issue for rake task gitlab:backup:create This is a fix for a database timeout which can occur when the backup create task is taking very long (1-2 hours). It seems that ActiveRecord is loosing the connection after a hour idleness and need to be reconnected before use. See merge request !2757
2016-02-09Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into ↵Robert Speicher
'master' Fix CurrentSettings autoload bug in development _Originally opened at !2526 by @huacnlee._ - - - In development env, when we changed any file hit Rails reload, it will failed with this message: ``` A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active ``` See merge request !2753
2016-02-08Merge branch 'fix-init' into 'master' Rémy Coutable
Fixed init.d script not working on OS X -s flag of su doesn't work correctly on OS X, logging in as the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue Fixes Issue #3309 See merge request !1728
2016-02-08Make sure there is a connection before using ActiveRecordJeroen Nijhof
2016-02-08Expose MergeRequest::merge_status to APIAndrei Dziahel
2016-02-08Fixed init.d script not working on OS Xritave
-s flag of su doesn't work correctly on some systems, loging in the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue
2016-02-08API: Allow to set or update a merge-request's milestoneKirill Skachkov
2016-02-08Fix CurrentSettings autoload bug in development.Jason Lee
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
2016-02-08suppress only errors in init-script while determining canonical path of ↵Harald Spaethe
gitlab_workhorse_dir
2016-02-06Allow limited Markdown in Broadcast MessagesRobert Speicher
Closes #11853
2016-02-05Merge branch 'master' into ci-permissionsKamil Trzcinski
# Conflicts: # db/schema.rb
2016-02-05one more improvement to snippet searchValery Sizov
2016-02-05Faster snippet searchValery Sizov
2016-02-05Freeze the expression instead of the literalZeger-Jan van de Weg
Also remove the spec for it
2016-02-05Minor refactoring on Gitlab::GitZeger-Jan van de Weg
2016-02-04Increase project import timeout from 4 minutes to 15 minutesDrew Blessing
Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
2016-02-04Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan
Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
2016-02-04Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets
2016-02-04Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski
# Conflicts: # app/views/projects/builds/index.html.haml
2016-02-04Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski
2016-02-04Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski
2016-02-04Make Pipelines responsible for defining their custom whitelistRobert Speicher
This allows for future pipelines to more easily define a custom whitelist.
2016-02-03Merge branch 'support-akismet' into 'master' Robert Speicher
Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
2016-02-03Display database type and version in Administration dashboardRobert Speicher
Closes #12900
2016-02-02Merge branch 'patch-1' into 'master' Robert Speicher
Consistent rails_socket use. [ci skip] See merge request !2596
2016-02-02Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer
Send raw Git blobs via gitlab-workhorse See merge request !2451
2016-02-02fixed move project method in migrationJames Lopez
2016-02-02Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' Dmitriy Zaporozhets
Fix add_pagination_headers to keep request parameters in Link header Originally opened at !2321. Closes #5904. /cc @Michi302 See merge request !2674
2016-02-02Fix add_pagination_headers to keep request parameters in Link headerMichi302
2016-02-02Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez
2016-02-02Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 10:27:33 +0300