summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Improve readability of 'rake cache:clear' coderefactor-scanJacob Vosmaer2016-02-191-6/+5
|
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-1/+2
|\ | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * Update Emoji asset pathRobert Speicher2016-02-121-1/+2
| | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
* | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-183-56/+4
| | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-183-4/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782
| * | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-183-4/+56
| | |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-185-13/+28
|\ \ \ | |/ / | | | | | | cache-clear
| * | Fix builds scheduler when first build is allowed to failGrzegorz Bizon2016-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Before this fix when there was only one relevant, previous build and it failed, but was allowed to fail, entire build had been marked as skipped. Closes #3192
| * | Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis2016-02-171-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining sqlite method call Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535 See merge request !2862
| | * | Remove remaining sqlite method callAchilleas Pipinellis2016-02-171-1/+0
| | | |
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-171-0/+2
| |\ \ \ | | | | | | | | | | | | | | | git-archive-refactor
| | * \ \ Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| | | * | | Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #13469
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1731-121/+262
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | git-archive-refactor
| * | | | | Fix APIJacob Vosmaer2016-02-112-3/+3
| | | | | |
| * | | | | First version of "git archive" headersJacob Vosmaer2016-02-022-9/+25
| | | | | |
* | | | | | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-181-4/+15
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway.
* | | | | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-162-17/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | 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
View Lorry Controller Status