summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unrelated changesfix-deployment-metrics-in-mr-widgetShinya Maeda2018-11-131-5/+1
|
* Add changelogShinya Maeda2018-11-131-0/+6
|
* Do not remove the existing permission checkShinya Maeda2018-11-131-1/+1
|
* Add spec for deployment metricsShinya Maeda2018-11-133-4/+44
|
* Fix deployment metrics in MR widgetShinya Maeda2018-11-131-1/+5
|
* Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
|\ | | | | | | | | Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
| * Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
| |
* | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-1216-411/+594
|\ \ | | | | | | | | | | | | Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
| * | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-1216-411/+594
| | | | | | | | | | | | | | | | | | | | | Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-123-7/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
| * | | Fix non-hacking wayKamil Trzciński2018-11-122-2/+3
| | | |
| * | | Revert "Just fix (hack) specs"Kamil Trzciński2018-11-124-9/+9
| | | | | | | | | | | | | | | | This reverts commit c739b8e0d6258276100da68c2ba1e2ecb7e8bde1.
| * | | Just fix (hack) specsKamil Trzciński2018-11-124-9/+9
| | | |
| * | | Simplify testKamil Trzciński2018-11-121-14/+9
| | | |
| * | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-122-3/+6
| | | |
| * | | tags testKamil Trzciński2018-11-121-1/+13
| | | |
* | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-1213-54/+43
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
| * | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-0913-54/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-122-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
| * | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
* | | | | Merge branch 'dm-disable-codeowners' into 'master'Sean McGivern2018-11-121-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable CODEOWNERS for the time being See merge request gitlab-org/gitlab-ce!22991
| * | | | | Disable CODEOWNERS for the time beingDouwe Maan2018-11-121-0/+0
| |/ / / / | | | | | | | | | | | | | | | We can move the file back to its original location once https://gitlab.com/gitlab-org/gitlab-ee/issues/8396 is fixed.
* | | | | Merge branch '52937-remove-feature-flag' into 'master'Phil Hughes2018-11-126-66/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Removes feature flag for ciEnvironmentsStatusChanges Closes #52937 See merge request gitlab-org/gitlab-ce!22947
| * | | | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-126-66/+2
|/ / / /
* | | | Merge branch 'sh-bump-redis-store' into 'master'Rémy Coutable2018-11-122-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump redis-store to 1.6.0 See merge request gitlab-org/gitlab-ce!22963
| * | | | Bump redis-store to 1.6.0sh-bump-redis-storeStan Hu2018-11-102-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This version supports SSL/TLS via the redis:// URL scheme: https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/47702
* | | | Merge branch 'sh-bump-mime-types' into 'master'Rémy Coutable2018-11-122-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump mime-types to 3.2.2 See merge request gitlab-org/gitlab-ce!22957
| * | | | MIME type application/javascript -> application/ecmascriptsh-bump-mime-typesStan Hu2018-11-101-1/+1
| | | | |
| * | | | Bump mime-types to 3.2.2Stan Hu2018-11-091-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Full list of changes: https://github.com/mime-types/ruby-mime-types/blob/master/History.md This matches the version shipped in gitaly-ruby.
* | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-1221-60/+1264
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-0921-60/+1264
| | | | |
* | | | | Merge branch 'patch-31' into 'master'Stan Hu2018-11-121-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
| * | | | | Set an empty entrypoint for license_management jobPhilippe Lafoucrière2018-11-101-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'leipert-remove-unnecessary-dependencies' into 'master'Rémy Coutable2018-11-121-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary job dependencies See merge request gitlab-org/gitlab-ce!22961
| * | | | | Remove unnecessary job dependenciesleipert-remove-unnecessary-dependenciesLukas Eipert2018-11-101-3/+5
| |/ / / /
* | | | | Merge branch 'mr-tree-filter-path-name' into 'master'Filipa Lacerda2018-11-123-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed diff tree filtering to path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
| * | | | | Changed diff tree filtering to pathPhil Hughes2018-11-123-2/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* | | | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-129-23/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
| * | | | | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvementPhil Hughes2018-11-091-8/+11
| | | | | |
| * | | | | Fixed failing note actions specPhil Hughes2018-11-091-0/+3
| | | | | |
| * | | | | Init task list when creating new note & discussionPhil Hughes2018-11-092-0/+2
| | | | | |
| * | | | | Fix TaskList init on update & pollPhil Hughes2018-11-093-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate TaskList requests being made
| * | | | | Improve initial rendering of discussion notesPhil Hughes2018-11-095-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis.
* | | | | | Merge branch 'rails5-update-gemfile' into 'master'Sean McGivern2018-11-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984
| * | | | | | Upgrade whitequark/parser to 2.5.3.0Jan Provaznik2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 counterpart to the version update from 7fb30b4cc4994022e55460e6905996212859cfb6
* | | | | | | Merge branch 'docs-dev-guidelines-update' into 'master'Achilleas Pipinellis2018-11-123-319/+459
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: updates docs development guidelines Closes #53160 and #53115 See merge request gitlab-org/gitlab-ce!22813
| * | | | | | | Docs: updates docs development guidelinesMarcia Ramos2018-11-123-319/+459
|/ / / / / / /
* | | | | | | Merge branch 'docs/danger-documentation' into 'master'Rémy Coutable2018-11-121-3/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dangerbot: mention tech writers based on DevOps stage See merge request gitlab-org/gitlab-ce!22945
| * | | | | | | Proper markdown table in docs DangerfileAchilleas Pipinellis2018-11-121-14/+16
| | | | | | | |
| * | | | | | | Edits to docs Dangerfiledocs/danger-documentationMike Lewis2018-11-091-10/+21
| | | | | | | |