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
2018-06-07Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
2018-06-05create favicon overlay on the clientAlexis Reigel
the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront.
2018-06-01Rephrase "maintainer" to more precise "members who can merge to the target ↵Mark Chao
branch" "Maintainer" will be freed to be used for #42751
2018-05-31Remove whitespaceFilipa Lacerda
2018-05-29Add 'squash and rebase' feature to CEblackst0ne
2018-05-23Merge branch 'master' into bootstrap4Clement Ho
2018-05-22Rename merge request widget author componentGeorge Tsiolis
2018-05-16Merge branch 'master' into bootstrap4Clement Ho
2018-05-14Merge branch 'refactor/move-squash-before-merge-vue-component' into 'master'Phil Hughes
Move SquashBeforeMerge vue component See merge request gitlab-org/gitlab-ce!18813
2018-05-14Merge branch '45462-sha-object' into 'master'Phil Hughes
Resolve "`sha-mismatch` vue component is rendering an empty block" Closes #45462 See merge request gitlab-org/gitlab-ce!18884
2018-05-11Fix broken testsFilipa Lacerda
2018-05-11Merge branch 'master' into 'bootstrap4'Clement Ho
# Conflicts: # app/views/groups/group_members/index.html.haml
2018-05-10Rename btn-secondary to btn-defaultAnnabel Dunstone Gray
2018-05-10Fixes eslintFilipa Lacerda
2018-05-10Moves mr widget to a vue componentFilipa Lacerda
Prevents maintainer edit to render a blank div Properly names sha mismatch component
2018-05-08Moves MR widget external link icon to the rightJacopo
2018-05-08Merge branch 'master' into bootstrap4Clement Ho
2018-05-08Move SquashBeforeMerge vue componentGeorge Tsiolis
2018-05-07Display merge commit SHA in merge widget after mergeOswaldo Ferreira
2018-05-02Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling
Move WorkInProgress vue component See merge request gitlab-org/gitlab-ce!17536
2018-04-30Merge branch 'master' into 'bootstrap4'Clement Ho
# Conflicts: # app/views/ci/variables/_variable_row.html.haml
2018-04-27Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann
2018-04-17[skip ci] Merge branch 'master' into bootstrap4Clement Ho
2018-04-17Fix dropdownsClement Ho
2018-04-17Move PipelineFailed vue componentGeorge Tsiolis
2018-04-17Merge branch 'master' into bootstrap4Clement Ho
2018-04-16Move WorkInProgress vue componentGeorge Tsiolis
2018-04-16Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into ↵Mike Greiling
'master' Move ReadyToMerge vue component See merge request gitlab-org/gitlab-ce!17545
2018-04-16Merge branch 'master' into 'bootstrap4'Clement Ho
# Conflicts: # app/views/admin/application_settings/_signin.html.haml
2018-04-13[skip ci] col-*-push and col-*-pull => order-*Clement Ho
2018-04-13Fix the metrics link being not rendering the htmlJose Ivan Vargas
2018-04-13[skip ci] Convert btn-xs to btn-smClement Ho
2018-04-12Merge branch 'master' into bootstrap4Clement Ho
2018-04-11[skip ci] .control-label to .col-form-labelClement Ho
2018-04-11Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho
Add i18n and update specs for UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17866
2018-04-09Merge branch 'master' into 'bootstrap4'Clement Ho
# Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml
2018-04-09Rename .btn-default to .btn-secondaryClement Ho
2018-04-09Rename col-xs-* to col-*Clement Ho
2018-04-06Checks if commit information exists before trying to render itFilipa Lacerda
2018-03-30Move ReadyToMerge vue componentGeorge Tsiolis
2018-03-28Added Utility Function for WebIDE URLTim Zallmann
2018-03-28Fixed Code review CommentsTim Zallmann
2018-03-28Added Changes based on UX ReviewTim Zallmann
2018-03-28Re added The Web IDE ButtonTim Zallmann
2018-03-28Fix for MR Widget Header resetTim Zallmann
2018-03-28Fixes to Formatting to all FilesTim Zallmann
2018-03-28Basic Setup for MR ShowingTim Zallmann
2018-03-27Merge branch 'update-unresolved-discussions-vue-component' into 'master'Clement Ho
Add i18n and update specs for ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17870
2018-03-27Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis
2018-03-27Add i18n and update specs for ShaMismatch vue componentGeorge Tsiolis