summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-1814-448/+471
|\ | | | | | | # Conflicts: # app/assets/javascripts/main.js
| * Merge branch 'ph-even-more-es-modules' into 'master'Filipa Lacerda2017-12-189-363/+358
| |\ | | | | | | | | | | | | Exported JS classes as modules See merge request gitlab-org/gitlab-ce!15960
| | * Exported JS classes as modulesph-even-more-es-modulesPhil Hughes2017-12-159-363/+358
| | |
| * | Merge branch '39974-toggle-sidebar-btn' into 'master'Phil Hughes2017-12-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Stop toggle sidebar button from changing height on collapse Closes #39974 See merge request gitlab-org/gitlab-ce!15944
| | * | Stop toggle sidebar button from changing height on collapse39974-toggle-sidebar-btnAnnabel Dunstone Gray2017-12-151-1/+2
| | | |
| * | | Merge branch '38019-hide-runner-token' into 'master'Clement Ho2017-12-153-41/+54
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Hide runner token in CI/CD settings page Closes #38019 See merge request gitlab-org/gitlab-ce!15918
| | * | Hide runner token in CI/CD settings page38019-hide-runner-tokenEric Eastwood2017-12-153-41/+54
| | |/ | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
| * | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-152-43/+57
| |\ \ | | |/ | |/| | | | | | | | | | | | | Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904
| | * Update toggle styles to use iconsKushal Pandya2017-12-151-30/+34
| | |
| | * Use icons instead of string labels for togglesKushal Pandya2017-12-151-13/+23
| | |
* | | Export and use Notes ES modulePhil Hughes2017-12-155-8/+14
|/ /
* | Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-159-492/+463
|\ \ | | | | | | | | | | | | Export JS classes as modules See merge request gitlab-org/gitlab-ce!15952
| * | Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-159-492/+463
| | | | | | | | | | | | #38869
* | | Merge branch '38541-cancel-alignment' into 'master'Filipa Lacerda2017-12-151-6/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix button alignment on MWPS component Closes #38541 See merge request gitlab-org/gitlab-ce!15835
| * | | fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-111-6/+13
| | | |
* | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-151-0/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Added LFS badge to indicate LFS tracked files Closes #15567 See merge request gitlab-org/gitlab-ce!15845
| * | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-111-0/+5
| | | | | | | | | | | | | | | | Closes #15567
* | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-148-117/+65
| | | |
* | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-1419-133/+152
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-1367-1151/+989
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1163-381/+619
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0720-142/+211
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0719-136/+157
| | | | | | | |
* | | | | | | | Merge branch 'issue-description-field-typo' into 'master'Fatih Acet2017-12-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1253-464/+303
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | corrected typo in quick action data attributeMarcus Amargi2017-12-111-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-1312-60/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify dialog modal/popup dialog/confirmation dialog/modal to modal See merge request gitlab-org/gitlab-ce!15865
| * | | | | | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-125-13/+13
| | | | | | | | |
| * | | | | | | | Rename popup-dialog to modalWinnie Hellmann2017-12-129-47/+41
| |/ / / / / / /
* | | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-133-6/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898
| * | | | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-133-6/+18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* | | | | | | | Merge branch 'new-nav-tech-debt' into 'master'Phil Hughes2017-12-137-15/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove page-with-new-nav class See merge request gitlab-org/gitlab-ce!15819
| * | | | | | | Rename page-with-sidebar to layout-pagenew-nav-tech-debtAnnabel Dunstone Gray2017-12-086-11/+11
| | | | | | | |
| * | | | | | | Remove page-with-new-nav classAnnabel Dunstone Gray2017-12-082-4/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Export old code into es6 modulesFilipa Lacerda2017-12-1311-666/+650
| | | | | | |
* | | | | | | Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-133-21/+36
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update styling of empty states" Closes #40468 See merge request gitlab-org/gitlab-ce!15791
| * | | | | | Adds i18n40468-empty-statesFilipa Lacerda2017-12-122-4/+6
| | | | | | |
| * | | | | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1262-273/+356
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (54 commits) Updated image for diff navigation docs Milestone sidebar docs Use app host instead of asset host when rendering image blob or diff ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build Use shared interceptor in note specs Ignore temporary table in schema Check for null in job tooltip title Clarify casing of I18N placeholder names fixes some markup issues in the js style guide docs Fix migration that removes issues.branch_name 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 ...
| * \ \ \ \ \ \ Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1128-229/+466
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Fix image view mode Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Fix failing importer test case on MySQL due to missing trailing slash in root path Fix gitlab:import:repos Rake task moving repositories into the wrong location Allow git pull/push on project redirects Resolve "Include asset_sync gem" Use prefix for TableOfContents filter hrefs Resolve "No feedback when checking on checklist if potential spam was detected" Fix Rubocop Fix N+1 query when displaying events Add Chain::Command specs Fix a bug of before_sha being inproperly evaluated to `checkout_sha` Implement and use Gitlab::Ci::Pipeline::Chain::Command Fix invalid pipeline build chain tag evaluation Add docs explaining why you get signed out with "Remember me" Move the circuitbreaker check out in a separate process Migrate Git::Repository#fsck to Gitaly Fix new personal access token showing up in a flash message ...
| * | | | | | | | Update pipelines empty state [ci skip]Filipa Lacerda2017-12-072-19/+32
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'winh-cleanup-dropdowns' into 'master'Annabel Dunstone Gray2017-12-1227-344/+101
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up new dropdown styles Closes #39142 and #39446 See merge request gitlab-org/gitlab-ce!13676
| * | | | | | | Make label delete option redwinh-cleanup-dropdownsWinnie Hellmann2017-12-081-2/+0
| | | | | | | |
| * | | | | | | Fix top margin for right aligned dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | | |
| * | | | | | | Remove border radius from pipelines dropdownsWinnie Hellmann2017-12-081-1/+0
| | | | | | | |
| * | | | | | | Fix dropdown top marginWinnie Hellmann2017-12-081-1/+1
| | | | | | | |
| * | | | | | | Fix padding for search dropdownWinnie Hellmann2017-12-081-5/+0
| | | | | | | |
| * | | | | | | Remove new-style-dropdown mixinWinnie Hellmann2017-12-0826-85/+0
| | | | | | | |
| * | | | | | | Use global styles for filter dropdownsWinnie Hellmann2017-12-082-54/+10
| | | | | | | |
| * | | | | | | Make new .dropdown-menu-align-right style globalWinnie Hellmann2017-12-081-4/+2
| | | | | | | |