summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlsatishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-04-101108-18674/+52240
|\
| * Merge branch 'deploy-tokens-container-registry-specs' into 'master'Kamil Trzciński2018-04-105-12/+165
| |\ | | | | | | | | | | | | | | | | | | Verify that deploy token has valid access when pulling container registry image Closes #45148 See merge request gitlab-org/gitlab-ce!18260
| | * Verify that deploy token has valid access when pulling container registry imageMayra Cabrera2018-04-105-12/+165
| |/
| * Merge branch 'port-features-project-project-to-rspec' into 'master'Robert Speicher2018-04-1069-1467/+1173
| |\ | | | | | | | | | | | | Migrate features/project/project.feature to RSpec and reorganize several Project feature specs See merge request gitlab-org/gitlab-ce!18223
| | * Address review feedbackRémy Coutable2018-04-0920-101/+57
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * Migrate features/project/project.feature to RSpec and reorganize several ↵Rémy Coutable2018-04-0968-1411/+1161
| |/ | | | | | | | | | | Project feature specs Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Update CHANGELOG.md for 10.6.4Mayra Cabrera2018-04-0910-45/+18
| | | | | | [ci skip]
| * Merge branch 'feature/add_target_to_tags' into 'master'Robert Speicher2018-04-094-1/+13
| |\ | | | | | | | | | | | | Expose the target commit ID through the tag API See merge request gitlab-org/gitlab-ce!18248
| | * Expose the target commit ID through the tag APIAndrew Beresford2018-04-084-1/+13
| | | | | | | | | | | | | | | | | | This is useful for annotated tags, where the deferenced target is not the same as the tag object. At the moment there is no way to differentiate the two through the tag API. This change adds a "target" property and leaves the existing "commit" property alone so that existing behaviour is not altered.
| * | Merge branch ↵Yorick Peterse2018-04-0922-50/+188
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' Use Goldiloader for handling N+1 queries See merge request gitlab-org/gitlab-ce!18217
| | * | Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-0912-29/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goldiloader is great, but has several issues with has_many :through relations: * https://github.com/salsify/goldiloader/issues/12 * https://github.com/salsify/goldiloader/issues/14 * https://github.com/salsify/goldiloader/issues/18 Rather than try to figure out which applies in each case, we should just do the drudge work of manually disabling autoloading for all relations of this type. We can always use regular preloading for specific cases, but this way we avoid generating invalid queries through Goldiloader's magic.
| | * | Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-0912-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Goldiloader (https://github.com/salsify/goldiloader) can eager load associations automatically. This removes the need for adding "includes" calls in a variety of different places. This also comes with the added benefit of not having to eager load data if it's not used.
| * | | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'Rémy Coutable2018-04-095-7/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI image See merge request gitlab-org/gitlab-ce!18244
| | * | | Bump ruby 2.3.6 cache key and source installation docssh-bump-ruby-and-git-image-ciStan Hu2018-04-092-5/+6
| | | | |
| | * | | Bump .ruby-version from 2.3.6 to 2.3.7Stan Hu2018-04-091-1/+1
| | | | |
| | * | | Work around Ruby 2.3.7 bug by defining prepended class methods needed for testsStan Hu2018-04-092-0/+14
| | | | |
| | * | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI imageStan Hu2018-04-071-1/+1
| | | | |
| * | | | Merge branch '44296-commit-path' into 'master'Phil Hughes2018-04-093-49/+104
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot read property 'commit_path' of null" Closes #44296 See merge request gitlab-org/gitlab-ce!18231
| | * | | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-063-49/+104
| | | | | |
| * | | | | Merge branch 'gitlab-shell-7.1.2' into 'master'Douwe Maan2018-04-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell 7.1.2 See merge request gitlab-org/gitlab-ce!18258
| | * | | | | Use gitlab-shell 7.1.2gitlab-shell-7.1.2Jacob Vosmaer2018-04-091-1/+1
| | | | | | |
| * | | | | | Merge branch 'update-svgs' into 'master'Tim Zallmann2018-04-092-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Update GitLab SVGs version See merge request gitlab-org/gitlab-ce!18250
| | * | | | | Update GitLab SVGs versionPhil Hughes2018-04-092-4/+4
| | | | | | |
| * | | | | | Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'Sean McGivern2018-04-091-2/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix `can't modify frozen Array` errors See merge request gitlab-org/gitlab-ce!18239
| | * | | | | | Refactor `add_recipients`blackst0ne-rails5-fix-frozen-arrayblackst0ne2018-04-091-3/+2
| | | | | | | |
| | * | | | | | [Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rbblackst0ne2018-04-072-3/+3
| | | | | | | |
| * | | | | | | Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into ↵Yorick Peterse2018-04-093-10/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup" Closes #41981 See merge request gitlab-org/gitlab-ce!18009
| | * | | | | | | Remove unused User#manageable_group_projects (#41981)Dylan Griffith2018-04-091-4/+0
| | | | | | | | |
| | * | | | | | | Use project_authorizations instead of members to calculate manageable CI ↵Dylan Griffith2018-04-091-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | projects to speed up query (#41981)
| | * | | | | | | Allow group owner to enable runners from subgroups (#41981)Dylan Griffith2018-04-093-5/+32
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'move-board-blank-state-vue-component' into 'master'Filipa Lacerda2018-04-094-36/+48
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Move BoardBlankState vue component See merge request gitlab-org/gitlab-ce!17666
| | * | | | | | Move BoardBlankState vue componentGeorge Tsiolis2018-04-074-36/+48
| | | | | | | |
| * | | | | | | Merge branch 'feature/#37403-clearer-email-handler' into 'master'Sean McGivern2018-04-093-1/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make email handler clearer Closes #37403 See merge request gitlab-org/gitlab-ce!17501
| | * | | | | | | Make email handler clearerRiccardo Padovani2018-04-093-1/+43
| |/ / / / / / /
| * | | | | | | Merge branch 'zj-find-license-opt-out' into 'master'Grzegorz Bizon2018-04-092-1/+7
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Move FindLicense RPC to OPT OUT status See merge request gitlab-org/gitlab-ce!18228
| | * | | | | | Move FindLicense RPC to OPT OUT statusZeger-Jan van de Weg2018-04-062-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acceptance testing was successful in https://gitlab.com/gitlab-org/gitaly/issues/1058. So this is moved to OPT OUT. Part of https://gitlab.com/gitlab-org/gitaly/issues/1026
| * | | | | | | Merge branch 'blackst0ne-rails5-add-rails-controller-testing-gem' into 'master'Rémy Coutable2018-04-092-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add `rails-controller-testing` gem See merge request gitlab-org/gitlab-ce!18242
| | * | | | | | | [Rails5] Add `rails-controller-testing` gemblackst0ne-rails5-add-rails-controller-testing-gemblackst0ne2018-04-082-0/+6
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 `assert_template` and `assigns()` have been extracted to the `rails-controller-testing` gem. https://github.com/rails/rails/pull/20138/files This commit adds this gem for rails5.
| * | | | | | | Merge branch 'sh-fix-issue-45152' into 'master'Grzegorz Bizon2018-04-093-4/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined method `one?` when pushing to an existing merge request Closes #45152 See merge request gitlab-org/gitlab-ce!18243
| | * | | | | | | Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152Stan Hu2018-04-073-4/+16
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An untested code path was triggering an Exception because Fixnum doesn't have `one?` implemented in Rails, while arrays and collections do. Closes #45152
| * | | | | | | Merge branch '44224-remove-gl' into 'master'Phil Hughes2018-04-0915-33/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove modal boards code from global namepsace See merge request gitlab-org/gitlab-ce!18222
| | * | | | | | | Remove modal store and mixins from global scope44224-remove-glFilipa Lacerda2018-04-0615-33/+33
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into ↵Sean McGivern2018-04-091-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [Rails5] Add FALSE_VALUES constant to Service#boolean_accessor See merge request gitlab-org/gitlab-ce!18240
| | * | | | | | | [Rails5] Add FALSE_VALUES constant to Service#boolean_accessorblackst0ne-rails5-replace-true-values-with-false-valuesblackst0ne2018-04-081-1/+5
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 the `ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES` constant has been removed [1] and the remaining `FALSE_VALUES` constant has been moved to `ActiveModel::Type::Boolean` [2] [1]: https://github.com/rails/rails/commit/a502703c3d2151d4d3b421b29fefdac5ad05df61 [2]: https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6
| * | | | | | | Merge branch '32617-fix-template-selector-menu-visibility' into 'master'Phil Hughes2018-04-094-1/+77
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Template selectors menu title mistakenly shown after toggling previewed changes" Closes #32617 See merge request gitlab-org/gitlab-ce!18118
| | * | | | | | | Fix template selector menu visibilityFabian Schneider2018-04-084-1/+77
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-092-2/+13
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
| | * | | | | | Handle legacy repository archive requests with no ref givensh-handle-legacy-archive-requestsStan Hu2018-04-082-2/+13
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The legacy endpoint requires no reference and defaults to the root ref. Closes #45154
| * | | | | | Merge branch 'winh-badges-docs' into 'master'Douwe Maan2018-04-086-3/+83
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user documentation for badges Closes #41174 and #41176 See merge request gitlab-org/gitlab-ce!18200
| | * | | | | | Add user documentation for badgesWinnie Hellmann2018-04-086-3/+83
| |/ / / / / /
View Lorry Controller Status