summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-081-5/+10
|\ | | | | | | | | Fix route rename descendants if route.name is blank See merge request !9074
| * Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-081-5/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-081-1/+1
|\ \ | |/ |/| | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575
| * Bypass signup domain validation for external usersReza Mohammadi2017-02-081-1/+1
| | | | | | | | Fixes #25279
* | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-084-58/+98
|\ \ | | | | | | | | | | | | Store group and project full name and full path in routes table See merge request !8979
| * | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-084-58/+98
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'dz-limit-nested-groups' into 'master' Douwe Maan2017-02-081-1/+14
|\ \ | | | | | | | | | | | | Limit level of nesting for groups See merge request !9000
| * | Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-081-1/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * \ \ Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-077-9/+216
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (301 commits) added missed commit in rebase update Grape routes to work with current version of Grape adds changelog fixes cursor issue on pipeline pagination Use random group name to prevent conflicts List all groups/projects for admins on explore pages Fix indentation More backport Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Fixed variables_controller_spec.rb test Backport of the frontend view, including tests Updated the #create action to render the show view in case of a form error Improved code styling on the variables_controller_spec Added tests for the variables controller #update action Added a variable_controller_spec test to test for flash messages on the #create action Modified redirection logic in the variables cont. Added redirections to the index actions for the variables and triggers controllers Added a flash message to the creation of triggers Fixed tests, renamed files and methods Changed the controller/route name to 'ci/cd' and renamed the corresponding files ...
| * | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
| | | |
* | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-7/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | pass in current_user in MergeRequest and MergeRequestsHelper See merge request !8624
| * | | Remove MergeRequest#closes_issue?; Remove the default parameter value for ↵Dongqing Hu2017-01-311-6/+2
| | | | | | | | | | | | | | | | #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
| * | | use the current_user parameter in MergeRequest#issues_mentioned_but_not_closingDongqing Hu2017-01-181-1/+1
| | | |
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-076-42/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | Address feedbackDouwe Maan2017-02-064-53/+29
| | | | |
| * | | | CI is fine with lookup errorsDouwe Maan2017-02-061-1/+1
| | | | |
| * | | | No || neededDouwe Maan2017-02-061-1/+1
| | | | |
| * | | | Add feature specsDouwe Maan2017-02-061-1/+3
| | | | |
| * | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-065-34/+16
| | | | |
| * | | | Add testsDouwe Maan2017-02-063-6/+6
| | | | |
| * | | | Validate route mapDouwe Maan2017-02-061-12/+5
| | | | |
| * | | | Fix XSS issue by not using URI.joinDouwe Maan2017-02-061-2/+1
| | | | |
| * | | | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-065-10/+86
| | | | |
* | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-072-2/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal associations instead of polymorphic Closes #26908 See merge request !8769
| * | | | | Use normal associations instead of polymorphic.Ruben Davila2017-02-072-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't properly use foreign keys on columns that are configured for polymorphic associations which has disadvantages related to data integrity and storage. Given we only use time tracking for Issues and Merge Requests we're moving to the usage of regular associations.
* | | | | | Merge branch ↵Clement Ho2017-02-073-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25487-small-improvements-to-the-ui-of-mattermost-and-slack-command-services' into 'master' Resolve "Small improvements to the UI of Mattermost and Slack Command services" Closes #25487 See merge request !8491
| * | | | | | Added small improvments to the chat slash command servicesLuke "Jared" Bennett2017-02-073-5/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Updated specs
* | | | | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes stop button visible in environment page Closes #24147 See merge request !7379
| * | | | | | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| | | | | | |
| * | | | | | Update changesKamil Trzcinski2017-02-061-4/+4
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0632-352/+569
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-24113-1685/+3006
| |\ \ \ \ \ \ \
| * | | | | | | | Allow to stop any environmentKamil Trzcinski2016-11-101-4/+9
| | | | | | | | |
* | | | | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' Rémy Coutable2017-02-072-1/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Refresh authorizations when transferring projects See merge request !9029
| * | | | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-072-1/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that project authorizations are refreshed when moving a project from one namespace to another. When doing so the permissions for all users of both the old and new namespaces are refreshed. See #26194 for more information.
* | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-3/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | | | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| | | | | | | |
| * | | | | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-0/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-061-4/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip or retain project while deleting the project: Closes #15005 See merge request !8960
| * | | | | | | Skip or retain project while deleting the project:Lin Jen-Shin2017-02-031-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Skip Ci::Build#update_project_statistics whenever there's no project (i.e. we're deleting the project!) * Retain the unscoped_project before deleting the build, so that we could use the data to delete the artifacts. Note that carrierwave uses `after_commit` for this, so we need to retain it in the memory. Closes #15005
* | | | | | | | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-061-2/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-7/+17
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-2/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Store the value in application settings. Expose the value to Workhorse.
| * | | | | Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-032-5/+1
| |/ / / /
* | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-038-255/+321
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from EE squash See merge request !8912
| | * | | | Backport changes from EE squashSean McGivern2017-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
View Lorry Controller Status