summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-6/+2
|
* Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-123-14/+25
| | | | | | | | - 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.
* Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵Douwe Maan2016-02-121-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
| * API: Allow to set or update a merge-request's milestoneKirill Skachkov2016-02-081-2/+4
| |
* | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
| |
* | Merge branch 'remove_sqlite_check' into 'master' Jeroen van Baarsen2016-02-111-18/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove sqlite check in raketask This is a relic from 4 major releases ago. Time to remove it. See merge request !2777
| * | Remove sqlite check in raketaskremove_sqlite_checkAchilleas Pipinellis2016-02-101-18/+0
| | |
* | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵Rémy Coutable2016-02-111-0/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Schniz/gitlab-ce-feature/merge-request-closes-issues-in-apiRémy Coutable2016-02-111-1/+1
| | | | | | | | | | | | API specs
| * | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵Gal Schlezinger2016-02-111-0/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-101-4/+9
|\ \ | | | | | | | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770
| * | Edit configuration files for relative URL supportAchilleas Pipinellis2016-02-091-4/+9
| |/ | | | | | | [ci skip]
* | Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher2016-02-091-3/+3
|\ \ | | | | | | | | | | | | Freeze constants in Gitlab::Git See merge request !1730
| * | Freeze the expression instead of the literalZeger-Jan van de Weg2016-02-051-2/+1
| | | | | | | | | | | | Also remove the spec for it
| * | Minor refactoring on Gitlab::GitZeger-Jan van de Weg2016-02-051-3/+4
| |/
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-096-19/+37
|\ \
| * \ Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-053-9/+35
| |\ \ | | |/ | | | | | | | | | # Conflicts: # db/schema.rb
| * | Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-0412-25/+124
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| * | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-042-8/+8
| | | |
| * | | Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski2016-02-042-3/+10
| | | |
| * | | Make the CI permission model simplerKamil Trzcinski2016-02-024-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Expose MergeRequest::merge_status to APIAndrei Dziahel2016-02-081-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-091-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
| * | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+16
| |/ / / | | | | | | | | | | | | Closes #11853
* | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-091-7/+3
|\ \ \ \
| * | | | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| | | | |
| * | | | Faster snippet searchValery Sizov2016-02-051-6/+2
| |/ / /
* | | | Merge branch 'backup-database-timeout-fix' into 'master' Robert Speicher2016-02-081-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
| |/ / /
* | | | Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into ↵Robert Speicher2016-02-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
| |/ / / | | | | | | | | | | | | Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
* | | | Merge branch 'fix-init' into 'master' Rémy Coutable2016-02-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fixed init.d script not working on OS Xritave2016-02-081-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | -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
* | | | suppress only errors in init-script while determining canonical path of ↵Harald Spaethe2016-02-081-1/+1
|/ / / | | | | | | | | | gitlab_workhorse_dir
* | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-042-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | fixed move project method in migrationJames Lopez2016-02-021-1/+1
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-021-4/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-016-177/+54
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | refactor previous test and add validation to project modelJames Lopez2016-01-291-2/+2
| | | | |
* | | | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-6/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-6/+32
| | | | | | | | | | | | | | | | | | | | Closes #12900
* | | | | Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This allows for future pipelines to more easily define a custom whitelist.
* | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-033-2/+63
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| | | | |
| * | | | Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-021-7/+8
| | | | |
| * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-023-2/+62
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent rails_socket use. [ci skip] See merge request !2596
View Lorry Controller Status