summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change text from build to job in flash notice41136-job-erasedAnnabel Dunstone Gray2017-12-141-1/+1
|
* Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
|\ | | | | | | | | Update flipper to 0.11.0 and take advantage of the new features See merge request gitlab-org/gitlab-ce!15920
| * Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
| | | | | | | | | | | | | | | | - Added an ActiveSupport (using Rails.cache) caching adapter - Overview of the new features can be found at https://johnnunemaker.com/flippin-features-at-runtime/ - Full Changelog can be found at https://github.com/jnunemaker/flipper/blob/v0.11.0/Changelog.md Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
|\ \ | | | | | | | | | | | | Converted JS files into exported modules See merge request gitlab-org/gitlab-ce!15933
| * | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-1410-121/+67
| | |
* | | Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-143-5/+12
|\ \ \ | | | | | | | | | | | | | | | | Fixed doc for create MR from email See merge request gitlab-org/gitlab-ce!15849
| * | | Fixed doc for create MR from emaildocs-jprovazn-create-from-emailJan Provaznik2017-12-123-5/+12
| | | | | | | | | | | | | | | | | | | | * fixed anchor for create MR from email * added a screenshot for this feature
* | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-142-3/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong project Closes gitlab-ee#4325 See merge request gitlab-org/gitlab-ce!15936
| * | | | Clear BatchLoader after each spec to prevent holding onto records longer ↵dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| | | | | | | | | | | | | | | | | | | | than necessary
| * | | | Include project in BatchLoader key to prevent returning blobs for the wrong ↵Douwe Maan2017-12-141-3/+9
| | |/ / | |/| | | | | | | | | | project
* | | | Merge branch '40509_sorting_tags_api' into 'master'Rémy Coutable2017-12-146-5/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | sorting for tags api See merge request gitlab-org/gitlab-ce!15772
| * | | | sorting for tags apihaseeb2017-12-146-5/+65
|/ / / /
* | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-143-14/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clear caches before updating MR diffs See merge request gitlab-org/gitlab-ce!15916
| * | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-143-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hook ordering influenced the diffs being generated as these used values from before the update due to the memoization still being in place. This commit reorders them and tests against this behaviour.
* | | | | Merge branch ↵Kamil Trzciński2017-12-143-10/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41110-dependencies-validator-fails-when-depended-job-is-manual' into 'master' Dependencies Validator fails when depended job is `manual` Closes #41110 See merge request gitlab-org/gitlab-ce!15924
| * | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-143-10/+7
| | | | | |
* | | | | | Merge branch 'qa/gb/update-qa-dependencies' into 'master'Grzegorz Bizon2017-12-143-52/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab QA dependencies See merge request gitlab-org/gitlab-ce!15929
| * | | | | | Use new Ruby version 2.4 in GitLab QA imagesGrzegorz Bizon2017-12-141-1/+1
| | | | | | |
| * | | | | | Update GitLab QA dependenciesGrzegorz Bizon2017-12-142-51/+45
| | | | | | |
* | | | | | | Merge branch 'gitlab-shell-5-10-3' into 'master'Grzegorz Bizon2017-12-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Bump gitlab-shell version to 5.10.3 See merge request gitlab-org/gitlab-ce!15932
| * | | | | | Bump gitlab-shell version to 5.10.3Sean McGivern2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-shell 5.10.3 does not introduce any new features; it just removes an unused config option.
* | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-146-7/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each other Closes #36054 See merge request gitlab-org/gitlab-ce!14289
| * | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-134-19/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a note is part of a discussion, the email sent out will be `In-Reply-To` the previous note in that discussion. It also `References` all the previous notes in that discussion, and the original issue. Closes gitlab-org/gitlab-ce#36054.
| * | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-135-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a note is part of a discussion, the email sent out should be `In-Reply-To` the previous note in that discussion. Closes gitlab-org/gitlab-ce#36054
* | | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-143-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use author info on commits list page rather than most recent commit date Closes #25317 See merge request gitlab-org/gitlab-ce!15868
| * | | | | | | | Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
| | | | | | | | |
| * | | | | | | | Change committed text to authoredAnnabel Dunstone Gray2017-12-131-1/+1
| | | | | | | | |
| * | | | | | | | Use author info on commits list page rather than most recent commit dateAnnabel Dunstone Gray2017-12-112-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1445-102/+510
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated queue for each Sidekiq worker See merge request gitlab-org/gitlab-ce!15882
| * | | | | | | | Remove unused queuesdm-dedicated-sidekiq-queuesDouwe Maan2017-12-133-4/+17
| | | | | | | | |
| * | | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ↵Douwe Maan2017-12-137-6/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manually set their queue
| * | | | | | | | Update docsDouwe Maan2017-12-121-15/+44
| | | | | | | | |
| * | | | | | | | Use a dedicated queue for each workerDouwe Maan2017-12-1237-81/+336
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'update-doc-for-user-group-project-transfers' into 'master'Douwe Maan2017-12-143-10/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Clarifies documentation for user, group & project transfers See merge request gitlab-org/gitlab-ce!15896
| * | | | | | | Updates doc for user, group & project transfersupdate-doc-for-user-group-project-transfersMayra Cabrera2017-12-133-10/+15
| | | | | | | |
* | | | | | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-1424-234/+251
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Export date utility functions as ES6 modules See merge request gitlab-org/gitlab-ce!15782
| * | | | | | | Fixes after review38869-datetimeFilipa Lacerda2017-12-131-3/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-13202-1958/+2665
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (85 commits) Export old code into es6 modules Use relative URL for projects to avoid storing domains Fix spec by avoiding monkeypatching Return the noteable in Note#touch_noteable add CHANGELOG.md entry for !15889 fix broken empty state assets for environment monitoring page removed tab indexes from tag form Refactor entrypoint override docs Present member collection at the controller level Adds i18n check the import_status field before doing SQL operations to check the import url Fix rubocop offence Fix entrypoint overriding documentation Remove unnecessary js-issuable-edit Use memoization for commits on diffs Move Repository#write_ref to Git::Repository#write_ref Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated Center cluster title Remove noisy notification from QA base page Remove unused page from hashed storage QA scenario ...
| * \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-11376-2333/+5008
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (112 commits) small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc Improve down step of removing issues.assignee_id column Fix specs after removing assignee_id field Remove issues.assignee_id column Resolve conflicts in app/models/user.rb Fix image view mode Do not raise when downstream pipeline is created Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Remove allocation tracking code from InfluxDB sampler for performance ...
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-07155-1133/+3373
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (82 commits) Docs: add EEU tier to the landing page CE backport of ProtectedBranches API changes Support uploads for groups Update pipeline create chain Prometheus metric Don't set timeago title to what was already there. Resolve "Display member role per project" The API isn't using the appropriate services for managing forks Add chevron to create dropdown on repository page Rename GKE as Kubernetes Engine Fix specs for MySQL Fix broken tests Refactor banzai to support referencing from group context Fix specs after rebase Prevent dups when using StringIO for binary reads Bump redis-rails to 5.0.2 to get redis-store security updates add note on deploying Pages to a private network Bump GITLAB_SHELL_VERSION Updates the dropdown to match the docs and remove old hack of stop event propagation Move invalid builds counter out of the transaction Add invalid builds counter metric to stage seeds class ...
| * | | | | | | | | | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-0724-237/+256
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'issue-description-field-typo' into 'master'Fatih Acet2017-12-132-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected typo in quick action data attribute Closes #41035 See merge request gitlab-org/gitlab-ce!15872
| * | | | | | | | | | Merge branch 'master' into issue-description-field-typoMarcus Amargi2017-12-12172-1126/+1810
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | corrected typo in quick action data attributeMarcus Amargi2017-12-112-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-1310-6/+198
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ordering to projects contributors in API Closes #13695 See merge request gitlab-org/gitlab-ce!15469
| * | | | | | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-1310-6/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name|email|commits. The available `sort` options are: asc|desc.
* | | | | | | | | | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-1321-99/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify dialog modal/popup dialog/confirmation dialog/modal to modal See merge request gitlab-org/gitlab-ce!15865
| * | | | | | | | | | | | Update UX guidewinh-unify-modalsWinnie Hellmann2017-12-122-14/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-127-18/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename popup-dialog to modalWinnie Hellmann2017-12-1214-67/+61
| | |/ / / / / / / / / / | |/| | | | | | | | | |
View Lorry Controller Status