summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Speed up cached_pass? for composite rulesdeclarative-policy-optimisationsSean McGivern2017-10-041-8/+12
| | | | | | Both `Or` and `And` would evaluate whether each rule passed, then calculate a value based on the results of all of those. We can actually return early in many cases, without running the rule at all.
* Speed up DeclarativePolicy::Runner#steps_by_scoreSean McGivern2017-10-042-11/+25
| | | | | | | | | | | | | | | There were a couple of things here: 1. If the state was already enabled, we don't need to check all the remaining steps - only those that can prevent the state. (An enable followed by an enable is a no-op.) This logic is in `#run`, but we still did the work of scoring and sorting the steps. 2. The sorting is known to be inefficient, but we can make it slightly more efficient by stopping once we have a step with zero score, as that means it's free. Neither of these make this _fast_, especially when called lots of times - as we do when there is lots of activity on an issue - but they do help some.
* Merge remote-tracking branch 'dev/master'Jarka Kadlecova2017-10-041-0/+4
|\
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| |\
| | * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-10-041-0/+4
| | |\
| | | * Update CHANGELOG.md for 9.5.7Jose Ivan Vargas2017-10-031-0/+4
| | | | | | | | | | | | [ci skip]
* | | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet2017-10-046-1/+67
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Hide close MR button after merge without reloading page Closes #36742 See merge request gitlab-org/gitlab-ce!14122
| * | | Hide close MR button after merge without reloading pageJacopo2017-09-246-1/+67
| | | | | | | | | | | | | | | | After merging a MR the close button is hidden, without reloading the page.
* | | | Merge branch 'dm-pat-revoke' into 'master'Sean McGivern2017-10-044-3/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revoked Closes #38650 See merge request gitlab-org/gitlab-ce!14660
| * | | | Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revokeDouwe Maan2017-10-034-3/+14
| | | | |
* | | | | Merge branch 'icons-profile-icons' into 'master'Phil Hughes2017-10-041-9/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Updated Profile Events Helper to use SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14577
| * | | | Updated Profile Events Helper to use SVG Sprite IconsTim Zallmann2017-10-041-9/+11
|/ / / /
* | | | Merge branch '3612-update-script-template-order-in-vue-files' into 'master'Filipa Lacerda2017-10-0412-97/+121
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-arrange <script> tags before <template> tags in .vue files Closes #38743 See merge request gitlab-org/gitlab-ce!14671
| * | | | Re-arrange <script> tags before <template> tags in .vue files3612-update-script-template-order-in-vue-filesEric Eastwood2017-10-0312-97/+121
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38743
* | | | | Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'Filipa Lacerda2017-10-042-0/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable comment textarea while submitting a new comment. Closes #37858 See merge request gitlab-org/gitlab-ce!14541
| * | | | | Add tests for handle save method of the comment form.acet-disabled-comment-textarea-while-requestingFatih Acet2017-10-031-0/+40
| | | | | |
| * | | | | Disable comment textarea while submitting a new comment.Fatih Acet2017-10-031-0/+1
| | | | | |
* | | | | | Merge branch 'winh-vue-styleguide-link-docs' into 'master'Filipa Lacerda2017-10-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to Vue.js style guide See merge request gitlab-org/gitlab-ce!14667
| * | | | | | Fix link to Vue.js style guidewinh-vue-styleguide-link-docswinh-vue-styleguide-linkWinnie Hellmann2017-10-031-1/+1
| | | | | | |
* | | | | | | Merge branch 'fix-ssh-key-mutation' into 'master'Douwe Maan2017-10-042-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure key fingerprints are generated correctly when modified See merge request gitlab-org/gitlab-ce!14663
| * | | | | | | Ensure key fingerprints are generated correctly when modifiedNick Thomas2017-10-032-0/+11
| | | | | | | |
* | | | | | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-0443-155/+1541
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
| * | | | | | | | Fix rubocop error31050-registry-image-listsFilipa Lacerda2017-10-031-1/+1
| | | | | | | | |
| * | | | | | | | Fix broken testFilipa Lacerda2017-10-031-2/+5
| | | | | | | | |
| * | | | | | | | Fix rubocop failuresKamil Trzcinski2017-10-031-8/+8
| | | | | | | | |
| * | | | | | | | Add serializer matchersKamil Trzcinski2017-10-0212-62/+279
| | | | | | | | |
| * | | | | | | | [ci skip] Render separator only when both values are presentFilipa Lacerda2017-09-281-2/+4
| | | | | | | | |
| * | | | | | | | Improve loading iconFilipa Lacerda2017-09-281-0/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-28251-1857/+2772
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (91 commits) refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixes commit comments in side-by-side diff view Update CHANGELOG.md for 10.0.2 Fix linting errors in locale/index.js Update CI parallelization description ...
| * | | | | | | | | Simplifies HTML by removing the empty state in cellsFilipa Lacerda2017-09-271-18/+4
| | | | | | | | | |
| * | | | | | | | | Changes after reviewFilipa Lacerda2017-09-272-7/+7
| | | | | | | | | |
| * | | | | | | | | Fixes destroy endpointFilipa Lacerda2017-09-261-2/+2
| | | | | | | | | |
| * | | | | | | | | Adds tests for new table componentFilipa Lacerda2017-09-2610-89/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes eslint problems
| * | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-26433-2131/+5681
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Fix a dash being rendered in the note's access role Remove dead `Gitlab::Markdown::Pipeline` class Add CHANGELOG entry Fix locked shared runners problem Document manual cleanup after background migration stealing Removes cycle analytics service and store from global namespace Fix PG::UniqueViolation external_email migration Migrate Gitlab::Git::Repository#log to Gitaly Check for exec permissions also in app/ Add check for exec permissions and refactor lint doc script Update tests to reflect `user_avatar_without_link` helper changes Change mode to 644 for all md and png files Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `image_tag` helper Remove unnecessary use of `gsub` Fixed few gitlab:check tasks that were failing with exception Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Improve list of sorting options ...
| * | | | | | | | | | Moves table component into a separate oneFilipa Lacerda2017-09-254-127/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds better support for i18n
| * | | | | | | | | | Improves toggle methodFilipa Lacerda2017-09-251-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Changes after reviewFilipa Lacerda2017-09-256-63/+65
| | | | | | | | | | |
| * | | | | | | | | | Change layout orderFilipa Lacerda2017-09-222-7/+12
| | | | | | | | | | |
| * | | | | | | | | | Removes unused fileFilipa Lacerda2017-09-221-32/+0
| | | | | | | | | | |
| * | | | | | | | | | Adds paginationFilipa Lacerda2017-09-2211-103/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds specs
| * | | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-22297-3431/+4329
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (112 commits) Replace the 'project/service.feature' spinach test with an rspec analog Removed two legacy config options Fix rendering double note issue. IssueNotes: Switch back to Write pane when note cancel or submit. Upgrade Nokogiri because of CVE-2017-9050 Bump VERSION to 10.1.0-pre Standardize access to CSRF token in JavaScript Do not clone the repo when running the review-docs jobs Don't memoize storage configuration on `FsShardsCheck` Document that group Owners can always create subgroups Auto DevOps docs cleanup Display full pre-receive and post-receive hook output in GitLab UI Adds EE tag detection to remove_old in gitlab backup. Correctly detect multiple issue URLs after 'Closes...' in MR descriptions new sharing permissions IssueNotes: Resize comment form after note submit and discard. [skip ci] Add changelog Make resolve discussion icon gray update spacing Deleted another Fixture due to User Callout ...
| * | | | | | | | | | | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-217-49/+96
| | | | | | | | | | | |
| * | | | | | | | | | | [ci skip] Adds tests to vuex and collapsibe componentFilipa Lacerda2017-09-2019-95/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats dates Fixes clipboard button Simplifies HTML
| * | | | | | | | | | | Removes 2 column layout. Adds i18n supportFilipa Lacerda2017-09-191-55/+47
| | | | | | | | | | | |
| * | | | | | | | | | | [ci skip] First iteration: port haml into vueFilipa Lacerda2017-09-1914-75/+322
| | | | | | | | | | | |
| * | | | | | | | | | | Adds clipboard button componentFilipa Lacerda2017-09-193-17/+105
| | | | | | | | | | | |
| * | | | | | | | | | | Init store for registryFilipa Lacerda2017-09-199-0/+205
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '38417-use-explicit-boolean-vue-attribute' into 'master'Fatih Acet2017-10-0411-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use explicit boolean true attribute for show-disabled-button Closes #38417 See merge request gitlab-org/gitlab-ce!14672
| * | | | | | | | | | | | Use explicit boolean true attribute for show-disabled-button38417-use-explicit-boolean-vue-attributeEric Eastwood2017-10-0311-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38417
* | | | | | | | | | | | | Merge branch 'gitaly-delete-branch' into 'master'Douwe Maan2017-10-046-49/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement OperationService.UserDeleteBranch Gitaly RPC See merge request gitlab-org/gitlab-ce!14603
View Lorry Controller Status