summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-095-6/+12
|\ | | | | | | | | Don't use DiffCollection for deltas See merge request !11201
| * Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| |
| * Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| |
| * Don't use DiffCollection for deltasJacob Vosmaer2017-05-095-6/+14
| |
* | Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-0910-74/+579
|\ \ | | | | | | | | | | | | | | | | | | Add Prometheus memory sparkline to MR widget Closes #26944 See merge request !11209
| * | Add Prometheus memory sparkline to MR widgetkushalpandya2017-05-0910-74/+579
| | |
* | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-0929-43/+190
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064
| * | | Small code improvements and add migration specFelipe Artur2017-05-089-19/+72
| | | |
| * | | Fix specs 2Felipe Artur2017-05-0811-36/+41
| | | |
| * | | Populate merge requests head_pipeline_idFelipe Artur2017-05-082-1/+24
| | | |
| * | | Fix SpecsFelipe Artur2017-05-0818-24/+61
| | | |
| * | | Add merge requests association to pipelineFelipe Artur2017-05-082-1/+2
| | | |
| * | | Preloads head pipeline for each merge requestFelipe Artur2017-05-088-8/+36
| | | |
* | | | Merge branch '31888-follow-up-from-backport-of-multiple-assignees-feature' ↵Sean McGivern2017-05-095-68/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Follow-up from "Backport of Multiple Assignees feature"" See merge request !11185
| * | | | Remove unnecessary if checkClement Ho2017-05-091-1/+1
| | | | |
| * | | | Refactor haml31888-follow-up-from-backport-of-multiple-assignees-featureClement Ho2017-05-084-20/+22
| | | | |
| * | | | Refactor block into separate partialClement Ho2017-05-082-49/+50
| | | | |
* | | | | Merge branch 'remove-archive-to-file' into 'master' Robert Speicher2017-05-091-50/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitlab::Git#archive_to_file See merge request !11205
| * | | | | Remove some unused Gitlab::Git codeJacob Vosmaer2017-05-091-50/+0
| | | | | |
* | | | | | Merge branch 'tc-cache-trackable-attributes' into 'master' Douwe Maan2017-05-094-2/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit User's trackable attributes to update at most once/hour Closes #22068 See merge request !11053
| * | | | | | Devise can assign trackable fields, but only allow writes once/hourtc-cache-trackable-attributesToon Claes2017-05-083-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Not assigning the trackable fields seems to cause strange side-effects.
| * | | | | | Limit `update_tracked_fields` to write to database once/hourToon Claes2017-05-083-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time a user logs in or out, the Trackable attributes are written to the database. This is causing a lot of load on the database, for data that isn't really critical. So to avoid the database being hammered, add a Gitlab::ExclusiveLease before writing trackable attributes to the database. This lease expires after an hour, so only when the attributes were written more than an hour ago, they can be written again. Otherwise they are ignored.
* | | | | | | Merge branch 'improve-trigger-build-output' into 'master' Sean McGivern2017-05-092-11/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase verbosity of triggered build Closes omnibus-gitlab#2318 See merge request !11188
| * | | | | | | Improve readability of codeimprove-trigger-build-outputBalasankar C2017-05-091-3/+6
| | | | | | | |
| * | | | | | | Move triggering build logic to separate scriptBalasankar C2017-05-092-12/+19
| | | | | | | |
| * | | | | | | Print triggered pipeline id in a better formatBalasankar C2017-05-091-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'fix-main-bundle-sans-vue' into 'master' Clement Ho2017-05-092-7/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent vue.esm.js from being bundled into the primary JS bundle Closes #31966 See merge request !11177
| * | | | | | | | Prevent vue.esm.js from being bundled into the primary JS bundleMike Greiling2017-05-092-7/+14
|/ / / / / / / /
* | | | | | | | Merge branch 'fix/gb/make-environment-policy-specs-to-pass-on-ee' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Robustify environment policy specs to pass on EE See merge request !11203
| * | | | | | | Robustify environment policy specs to pass on EEfix/gb/make-environment-policy-specs-to-pass-on-eeGrzegorz Bizon2017-05-091-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'tc-fix-snippets-notes-spec' into 'master' Sean McGivern2017-05-091-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec/features/snippets/notes_on_personal_snippets_spec.rb Closes #31993 See merge request !11199
| * | | | | | | Fallback to default pattern when note does not belong to projecttc-fix-snippets-notes-specToon Claes2017-05-091-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 020295ff a regex was added to quickly determine if mentionables might be referenced. But this didn't take into account the note might not belong to a project. So when it doesn't belong to a project, assume the default issue tracker is used, and use DEFAULT_PATTERN to check if there are mentionables. Fixes gitlab-org/gitlab-ce#31993
* | | | | | | Merge branch 'fix/gb/fix-skipped-manual-actions' into 'master' Kamil Trzciński2017-05-093-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix skipped manual actions issue in pipeline processing Closes #30212 See merge request !11164
| * | | | | | | Fix skipped manual actions issue in pipeline processingfix/gb/fix-skipped-manual-actionsGrzegorz Bizon2017-05-083-1/+27
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'up-arrow-focus-discussion-comment' into 'master' Filipa Lacerda2017-05-094-1/+82
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed UP arrow key not editing last comment in discussion Closes #31348 See merge request !11173
| * | | | | | Fixed focused test in notes specup-arrow-focus-discussion-commentPhil Hughes2017-05-081-1/+1
| | | | | | |
| * | | | | | Fixed UP arrow key not editing last comment in discussionPhil Hughes2017-05-084-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31348
* | | | | | | Merge branch 'mrchrisw-fix-slack-notify' into 'master' Sean McGivern2017-05-093-2/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fix notify_only_default_branch check for Slack service See merge request !11154
| * | | | | | Fix notify_only_default_branch check for Slack servicemrchrisw-fix-slack-notifyChris Wilson2017-05-083-2/+18
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The notify_only_default_branch property is using boolean_accessor this means we need to check it using a question methods. Also add specs for disabling this option.
* | | | | | Merge branch 'mr-widget-redesign-review' into 'master' Jacob Schatz2017-05-09195-1557/+7028
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request widget redesign Closes #25424 and #27950 See merge request !10319
| * | | | | | Merge request widget redesignFatih Acet2017-05-09195-1557/+7028
|/ / / / / /
* | | | | | Merge branch 'update-guides-for-9-2' into 'master' Timothy Andrew2017-05-082-2/+290
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Update guides for 9.2 See merge request !11157
| * | | | | Update guides for 9.2.Timothy Andrew2017-05-082-2/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update the "Installation from Source" guide - Create an update guide for `9.1` to `9.2`
* | | | | | Merge branch ↵Filipa Lacerda2017-05-0810-26/+53
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28794-standardize-jasmine-test-describe-block-names-that-test-specific-methods' into 'master' Resolve "Standardize jasmine test describe block names that test specific methods" Closes #28794 See merge request !11137
| * | | | | [skip ci] add documentation28794-standardize-jasmine-test-describe-block-names-that-test-specific-methodsClement Ho2017-05-051-0/+27
| | | | | |
| * | | | | Standardize jasmine test describe block names that test specific methodsClement Ho2017-05-059-26/+26
| | | | | |
* | | | | | Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' ↵31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-jsDmitriy Zaporozhets2017-05-0811-13/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use regex to skip unnecessary reference processing in ProcessCommitWorker Closes #28359 See merge request !10867
| * | | | | | Cycle analytics specs needed Commit to reference issue28359-skip-process-commit-worker-unless-issues-referencedJames Edwards-Jones2017-05-044-10/+5
| | | | | | | | | | | | | | | | | | | | | The plan stage both measures time taken and lists related commits. We test for commits being listed, so needed to actually mention the issue in them. An alternative would have been adding “allow_any_instance_of(Commit).to receive(:matches_cross_reference_regex?).and_return(true)” but this felt too coupled to implementation.
| * | | | | | Use regex to skip unnecessary reference processing in ProcessCommitWorkerJames Edwards-Jones2017-05-047-3/+112
| | | | | | |
* | | | | | | Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into ↵Sean McGivern2017-05-081-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix notes_on_personal_snippets_spec Closes #31938 See merge request !11160
View Lorry Controller Status