summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* edit GitLab license info so that GitHub recognizes itAndrea Kao2018-04-102-22/+10
| | | | | | | | | | | | | | | GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit updates the LICENSE file so that it contains the exact text of the MIT license. It also moves the reference to third-party software licensing to the README. These changes allow Licensee to successfully identify the license type of GitLab's codebase as MIT. Signed-off-by: Andrea Kao <eirinikos@gmail.com>
* Merge branch '40487-update-vue-resource-stage' into 'master'Phil Hughes2018-04-102-68/+35
|\ | | | | | | | | Use axios in the stage component See merge request gitlab-org/gitlab-ce!18286
| * Update state request from vue resource to axiosFilipa Lacerda2018-04-102-68/+35
| |
* | Merge branch 'dm-seed-admin' into 'master'Sean McGivern2018-04-101-10/+10
|\ \ | | | | | | | | | | | | | | | | | | Make sure hooks run when seeding admin user Closes gitlab-development-kit#335 See merge request gitlab-org/gitlab-ce!18284
| * | Make sure hooks run when seeding admin userDouwe Maan2018-04-101-10/+10
| | |
* | | Merge branch 'blackst0ne-rails5-fix-spinach' into 'master'Rémy Coutable2018-04-102-1/+10
|\ \ \ | | | | | | | | | | | | | | | | [Rails5] Fix running spinach tests See merge request gitlab-org/gitlab-ce!18281
| * | | [Rails5] Fix running spinach testsblackst0ne2018-04-102-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add support for `RAILS5=1|true` for the `bin/spinach` command. 2. Synchronize used spinach versions both for rails4 and rails5. For rails5 it was accidently used spinach 0.10.1 instead of 0.8.10. That brought some problems on running spinach tests. Example of failure message: NoMethodError: undefined method `line' for #<Spinach::Scenario:0x000000000c86ba80> Did you mean? lines /builds/gitlab-org/gitlab-ce/features/support/env.rb:52:in `before_scenario_run'
* | | | Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-102-4/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Reduce complexity of issuable finder query. Closes #37125 See merge request gitlab-org/gitlab-ce!18219
| * | | Reduce complexity of issuable finder query.ab-37125-assigned-issues-queryAndreas Brandl2018-04-092-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the extra check for project-ids which is not needed at all. This does not necessarily reduce execution time of the query, but improves planning time by a few millseconds. Closes #37125.
* | | | Merge branch '42770_setup_security_products' into 'master'Dmitriy Zaporozhets2018-04-101-4/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Security Products jobs definitions See merge request gitlab-org/gitlab-ce!18265
| * | | | Update Security Products jobs definitionsOlivier Gonzalez2018-04-101-4/+38
|/ / / /
* | | | Merge branch 'revert-e9e800f5' into 'master'Marin Jankovski2018-04-104-104/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'" See merge request gitlab-org/gitlab-ce!18276
| * | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"Kamil Trzciński2018-04-104-104/+4
|/ / / / | | | | | | | | This reverts merge request !17730
* | | | Merge branch '40487-axios-pipelines' into 'master'Phil Hughes2018-04-106-267/+172
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace vue resource with axios for pipelines table See merge request gitlab-org/gitlab-ce!18264
| * | | | Replace vue resources with axios for pipelines tableFilipa Lacerda2018-04-096-267/+172
| | | | |
* | | | | Merge branch 'docs-gitaly-for-new-git-features' into 'master'Sean McGivern2018-04-101-4/+69
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Document process for new Git features See merge request gitlab-org/gitlab-ce!18230
| * | | | Document process for new Git featuresJacob Vosmaer (GitLab)2018-04-101-4/+69
|/ / / /
* | | | Merge branch 'gitaly-0.95.0' into 'master'Sean McGivern2018-04-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.95.0 See merge request gitlab-org/gitlab-ce!18256
| * | | | Use Gitaly 0.95.0gitaly-0.95.0Jacob Vosmaer2018-04-091-1/+1
| |/ / /
* | | | 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
| | | | | | |
View Lorry Controller Status