summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | User internal pipeline to access project in viewsGrzegorz Bizon2016-06-011-8/+8
| | | | | | | | |
| * | | | | | | | Add feature specs for pipeline in MR from forkGrzegorz Bizon2016-06-011-8/+38
| | | | | | | | |
| * | | | | | | | Add feature test for accessing MR created from forkGrzegorz Bizon2016-06-011-0/+28
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch ↵Douwe Maan2016-06-013-1/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'long.polyglot/gitlab-ce-issue_17479_todos_not_remove_when_leave_project'
| * | | | | | | | Add changelog and code refactorLong Nguyen2016-05-302-1/+6
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-30379-2113/+4115
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-223-0/+67
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * | | | | | | | | | Fix Member specLong Nguyen2016-05-221-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-224-3/+15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-212-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * | | | | | | | | | | | Fix broken specsLong Nguyen2016-05-211-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-21247-204/+4937
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * | | | | | | | | | | | | Fix broken specsLong Nguyen2016-05-212-3/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-212-11/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * | | | | | | | | | | | | | Remove todos when destroy project member and specsLong Nguyen2016-05-213-2/+47
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-20254-942/+4725
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-14106-576/+594
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_17479_todos_not_remove_when_leave_project
| * | | | | | | | | | | | | | | | Only show todos of projects that user is a member ofLong Nguyen2016-05-141-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'emails-on-push-use-sidekiq-mailers' into 'master' Douwe Maan2016-06-012-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make EmailsOnPushWorker use Sidekiq mailers queue A customer was having issues with EmailsOnPushWorker clogging the Sidekiq queues and merge requests not being handled quickly. While researching whether it would possible to spin up a separate Sidekiq task just to handle merge requests and other key functions, I found that this worker was using the default Sidekiq queue. Moving to the `mailers` queue makes it possible to de-prioritize this worker and give more weight to the others. See merge request !4390
| * | | | | | | | | | | | | | | | | Make EmailsOnPushWorker use Sidekiq mailers queueStan Hu2016-05-312-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmailsOnPushWorker was using the default queue, which made it impossible to prioritize MergeWorker and other key workers with a separate Sidekiq process.
* | | | | | | | | | | | | | | | | | Merge branch 'prefer-to_reference' into 'master' Douwe Maan2016-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `Snippet#to_reference` directly ## What does this MR do? Instead of hard coding snippet reference, we could just use the existing method for that. ## Why was this MR needed? To address https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4338#note_12166325 from @DouweM /cc @jschatz1 See merge request !4379
| * | | | | | | | | | | | | | | | | | Use `Snippet#to_reference` directlyLin Jen-Shin2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-015-3/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the "Remember me" value to the 2FA token form Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000 See merge request !4369
| * | | | | | | | | | | | | | | | | | | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-305-3/+35
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000
* | | | | | | | | | | | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-018-21/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Try and use cache for application settings even when the db is not connectedcurrent-settings-use-request-store-during-requestDJ Mountney2016-05-292-2/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update tests for the current_application_settings request store changesDJ Mountney2016-05-275-12/+12
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add Changelog entry for the fix for the health_check access token changingDJ Mountney2016-05-271-0/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Only use RequestStore for current_application_settings during a requestDJ Mountney2016-05-271-9/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the RequestStore was being populated with the settings in the unicorn master during the rails initializers. Each forked worker would then start their first request with an uncleaned RequestStore.
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-404-labels-in-todos' into 'master' Douwe Maan2016-06-013-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 page when viewing TODOs that contain milestones or labels in different projects A user viewing the TODOs page will see a 404 if there are mentioned milestones or labels in multiple different projects. This is likely a caching bug and only occurs when Markdown rendering occurs across multiple projects, which is why it's so tricky to reproduce. This is what I think is happening: 1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1. 2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...] 3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA. 4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2. 5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...] 6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB. 7. A is the wrong project, so the label lookup fails. This MR expands the `project_ref` to the right value as soon as we have it to avoid this caching bug. Closes #17898 See merge request !4312
| * | | | | | | | | | | | | | | | | | Fix 404 page when viewing TODOs that contain milestones or labels in ↵Stan Hu2016-05-313-1/+25
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different projects A user viewing the TODOs page will see a 404 if there are mentioned labels in multiple different projects. This is likely a caching bug and only occurs when Markdown rendering occurs across multiple projects, which is why it's so tricky to reproduce. This is what I think is happening: 1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1. 2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...] 3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA. 4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2. 5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...] 6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB. 7. A is the wrong project, so the label lookup fails. This MR caches Markdown references if the key is present. Closes #17898
* | | | | | | | | | | | | | | | | | Merge branch 'doc_api_services_jira_amend' into 'master' Rémy Coutable2016-06-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amend jira service api docs [ci skip] ## What does this MR do? Amends the API documentation for jira service integration ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? The current documentation omits the username and password parameters ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4382
| * | | | | | | | | | | | | | | | | | Amend jira service api docs [ci skip]Richard Grainger2016-05-311-0/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-0115-47/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labels fixes #15557 See merge request !4327
| * | | | | | | | | | | | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-3113-53/+52
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-314-3/+30
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0130-75/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-event-common-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltips for common Event feed entries This adds tooltips to the event target for events like "opened merge request !XYZ" After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090#note_11712839, several references in the event feed had titles but were still missing tooltips. See merge request !4371
| | * | | | | | | | | | | | | | | | | Add tooltips for common Event feed entriesrs-event-common-has-tooltipRobert Speicher2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds tooltips to the event target for events like "opened merge request !XYZ"
| * | | | | | | | | | | | | | | | | | Merge branch '17756-close-btn' into 'master' Jacob Schatz2016-05-312-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New style for close buttons ## What does this MR do? Adds new style for all `Close` buttons ## What are the relevant issue numbers? Closes #17756 ## Screenshots (if relevant) <img src="/uploads/a1d4cb8c22facb4c170e9cf3b4ae439a/Screen_Shot_2016-05-31_at_2.26.42_PM.png" width="800px"> <img src="/uploads/d567694d79ec6bd5da0ff2faf8b262b0/Screen_Shot_2016-05-31_at_2.26.09_PM.png" width="800px"> <img src="/uploads/f5e23d8031427079a334d4e03da466b0/Screen_Shot_2016-05-31_at_2.29.01_PM.png" width="800px"> cc @dzaporozhets See merge request !4388
| | * | | | | | | | | | | | | | | | | New style for close buttons17756-close-btnAnnabel Dunstone2016-05-312-2/+18
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'upgrade-kaminari' into 'master' Robert Speicher2016-05-319-12/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Kaminari from 0.16.3 to 0.17.0. Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170 Deprecates `num_pages` in favor of `total_pages` and includes Rails 5 support. Working towards #14286. See merge request !4387
| | * | | | | | | | | | | | | | | | | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-319-12/+12
| | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170 Deprecates num_pages in favor of total_pages and includes Rails 5 support.
| * | | | | | | | | | | | | | | | | Merge branch 'rs-create-remote-backup-folder' into 'master' Stan Hu2016-05-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the specified remote directory during backup This is idempotent, so there's no harm calling it if the directory already exists. Closes #12710 See merge request !4383
| | * | | | | | | | | | | | | | | | Create the specified remote directory during backuprs-create-remote-backup-folderRobert Speicher2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is idempotent, so there's no harm calling it if the directory already exists. Closes #12710
| * | | | | | | | | | | | | | | | | Merge branch 'refactoring/improve-build-specs' into 'master' Robert Speicher2016-05-311-22/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant factory namespace in build specs Extracted from !4351. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4351#note_12154604 See merge request !4373
| | * | | | | | | | | | | | | | | | | Remove redundant factory namespace in build specsrefactoring/improve-build-specsGrzegorz Bizon2016-05-311-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/models/build_spec.rb
| * | | | | | | | | | | | | | | | | | Merge branch 'feature/improve_wiki_page_events' into 'master' Rémy Coutable2016-05-315-10/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include Wiki attributes in Wiki page events webhook The hook data we are sending is not 100% correct (we send details of the project, but should also send details of the "ProjectWiki" attributes like URLs and repositories relative to the wiki itself). This is a follow up to #17506 Fixes #17507 See merge request !4138
| | * | | | | | | | | | | | | | | | | Add wiki page events fix to the Changelogfeature/improve_wiki_page_eventsGabriel Mazetto2016-05-311-0/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Codestyle changesGabriel Mazetto2016-05-311-2/+2
| | | | | | | | | | | | | | | | | | |