summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-101-0/+8
|\ | | | | | | | | Nested groups members page See merge request !9062
| * Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-101-0/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_26701' into 'master'Sean McGivern2017-02-091-1/+1
|\ \ | |/ |/| | | | | | | | | Remove JIRA closed status icon Closes #26701 See merge request !8944
| * Remove JIRA closed status iconissue_26701Felipe Artur2017-02-081-1/+1
| |
* | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-081-6/+18
|\ \ | | | | | | | | | | | | 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-6/+18
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-081-0/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575
| * | Bypass signup domain validation for external usersReza Mohammadi2017-02-081-0/+10
| | | | | | | | | | | | Fixes #25279
* | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-084-34/+70
|\ \ \ | | | | | | | | | | | | | | | | 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-34/+70
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'dz-limit-nested-groups' into 'master' Douwe Maan2017-02-081-11/+22
|\ \ \ | | | | | | | | | | | | | | | | Limit level of nesting for groups See merge request !9000
| * | | Limit level of nesting for groupsdz-limit-nested-groupsDmitriy Zaporozhets2017-02-081-11/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-3/+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-3/+3
| | | | | | | | | | | | | | | | #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-074-101/+166
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | Address feedbackDouwe Maan2017-02-063-113/+14
| | | | |
| * | | | Update outdated specDouwe Maan2017-02-061-2/+0
| | | | |
| * | | | Tweak test to verify there are no duplicatesDouwe Maan2017-02-061-2/+2
| | | | |
| * | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-063-79/+14
| | | | |
| * | | | Add testsDouwe Maan2017-02-064-0/+231
| | | | |
* | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-071-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal associations instead of polymorphic Closes #26908 See merge request !8769
| * | | | | Use normal associations instead of polymorphic.Ruben Davila2017-02-071-0/+28
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-8/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes stop button visible in environment page Closes #24147 See merge request !7379
| * | | | | Fix stoppable?Kamil Trzcinski2017-02-072-4/+4
| | | | | |
| * | | | | Update changesKamil Trzcinski2017-02-061-4/+4
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0670-377/+836
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-2481-2608/+5999
| |\ \ \ \ \ \
| * | | | | | | Allow to stop any environmentKamil Trzcinski2016-11-101-6/+28
| | | | | | | |
* | | | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-072-0/+20
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | | | | | More backportDouwe Maan2017-02-061-0/+33
| | | | | | | |
* | | | | | | | Update specDouwe Maan2017-02-061-2/+2
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-062-0/+212
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
| * \ \ \ \ \ \ Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-53/+34
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-039-138/+243
| |\ \ \ \ \ \ \
| * | | | | | | | Update validates_hostname to 1.0.6 to fix a bug in parsing ↵Nick Thomas2017-02-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hexadecimal-looking domain names
| * | | | | | | | Fix Rubocop offensesGrzegorz Bizon2017-02-011-7/+7
| | | | | | | | |
| * | | | | | | | Mock Dir::exist? in project_spec.rbKamil Trzcinski2017-01-311-2/+1
| | | | | | | | |
| * | | | | | | | Introduce pages_deployed? to Project modelKamil Trzcinski2017-01-311-6/+17
| | | | | | | | |
| * | | | | | | | Describe #pages_url instead of :pages_urlKamil Trzcinski2017-01-311-1/+1
| | | | | | | | |
| * | | | | | | | Fix the URL of group pagesKamil Trzcinski2017-01-311-0/+33
| | | | | | | | |
| * | | | | | | | Update commentsKamil Trzcinski2017-01-311-0/+4
| | | | | | | | |
| * | | | | | | | Verify trusted certificate chainKamil Trzcinski2017-01-311-4/+10
| | | | | | | | |
| * | | | | | | | Pages domain model specsKamil Trzcinski2017-01-312-0/+153
| | | | | | | | |
* | | | | | | | | Merge branch 'traits-for-featurs' into 'master'Robert Speicher2017-02-065-7/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add traits for ProjectFeatures to Project factory Closes #24007 See merge request !8925
| * | | | | | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-055-7/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
* | | | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-2/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the value in application settings. Expose the value to Workhorse.
* | | | | | | Merge branch 'rs-event-traits' into 'master' Rémy Coutable2017-02-032-16/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add traits for the different Event types to the Event factory See merge request !8870
| * | | | | | | Add traits for the different Event types to the Event factoryrs-event-traitsRobert Speicher2017-02-012-16/+16
| | | | | | | |
* | | | | | | | Merge branch 'add-issues-to-boards' into 'master' Fatih Acet2017-02-031-35/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issues to boards list Closes #26205 See merge request !8737
View Lorry Controller Status