Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-07Export date utility functions as ES6 modulesFilipa Lacerda
2017-11-22Fix missing MR widget status iconsEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40283 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/d01d509bd8612f9879fa762de8ea3763bcff81cf
2017-11-14Backport spec changes from EE remove approvals in empty stateEric Eastwood
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
2017-11-13Export text utils as ES6 modulesFilipa Lacerda
2017-11-08Resolve "Merge request widget - CI information has different margins"Filipa Lacerda
2017-11-06Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox
38394-smarter-interval
2017-11-02Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda
Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567
2017-10-31Load participants asyncEric Eastwood
2017-10-31remove global export from SmartIntervalSimon Knox
2017-10-30Fixing IconsTim Zallmann
2017-10-27Change default disabled merge request widget message to "Merge is not ↵Eric Eastwood
allowed yet" Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
2017-10-24don't re-run smart interval callback if there is already one in progressSimon Knox
because some things take time
2017-10-10karma spec fixesPhil Hughes
2017-10-10Flash is now a ES6 modulePhil Hughes
Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
2017-10-05Allow merge when no pipeline successEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
2017-10-05Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz
improve merge request widget status icon UX Closes #37229 See merge request gitlab-org/gitlab-ce!14200
2017-10-04Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet
Hide close MR button after merge without reloading page Closes #36742 See merge request gitlab-org/gitlab-ce!14122
2017-10-04Use explicit boolean true attribute for show-disabled-buttonEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38417
2017-10-03Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda
Fixes merge request widget date tooltip inconsistencies Closes #38545 See merge request gitlab-org/gitlab-ce!14578
2017-10-03Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox
2017-09-29Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood
2017-09-29fixed specs when merged event was emptyPhil Hughes
2017-09-29Fixes merge request widget date tooltip inconsistenciesPhil Hughes
Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545
2017-09-28Add period to multi-sentence rebase locally messageEric Eastwood
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
2017-09-27Merge branch 'master' into ff_port_from_eeEric Eastwood
2017-09-26Use js- classes instead of Vue refs in tests for some perfEric Eastwood
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
2017-09-24Hide close MR button after merge without reloading pageJacopo
After merging a MR the close button is hidden, without reloading the page.
2017-09-21Merge branch '37220-es-modules' into 'master'Phil Hughes
Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
2017-09-20improve merge request widget status icon UXSimon Knox
x to indicate failure or cannot merge
2017-09-20Port fast-forward MR widget states from EEEric Eastwood
See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
2017-09-19Change all instances of btn-sm to btn-small to keep things consistentJedidiah
2017-09-19Fix MR widget with external CI services/integrationsEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
2017-09-13Fix MR ready to merge buttons/controls at mobile breakpointEric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
2017-09-09Import modules instead of using the ones in global namespaceFilipa Lacerda
Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog
2017-09-09Use modules in common utilsFilipa Lacerda
2017-09-01Fix buttons with different height in merge request widgetFilipa Lacerda
2017-08-07Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira
2017-08-07clean up merge request widget UISimon Knox
2017-08-04Backport to CE for:Lin Jen-Shin
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
2017-07-28Merge issuable "reopened" state into "opened"Yorick Peterse
Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
2017-07-26Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann
2017-07-11Make commits behind text a link to the target branch commits pageClement Ho
2017-07-11Convert target branch link to use treeClement Ho
2017-07-06Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"Kamil Trzciński
This reverts merge request !12127
2017-06-26Handle missing pipeline in merge request widgetwinh
2017-06-21Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh
This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
2017-06-20Adjust position and wording for related issues in merge requestsWinnie Hellmann
2017-06-16Changed utilites imports from ~ to relative pathsJose Ivan Vargas
2017-05-30Merge branch ↵Fatih Acet
'32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
2017-05-29Add performance deltas between app deployments on Merge Request widgetKushal Pandya