summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-247-103/+135
| | | | | Adds i18n Adds better test coverage
* Merge branch 'qa-deploy-key-factory-product' into 'master'Grzegorz Bizon2018-01-241-0/+1
|\ | | | | | | | | Scrap the deploy key title and match it in test See merge request gitlab-org/gitlab-ce!16554
| * Add .qa-project-deploy-keys to locate itqa-deploy-key-factory-productLin Jen-Shin2018-01-201-0/+1
| | | | | | | | Without this, it's very hard to locate it.
* | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-241-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
| * | disable CopyAsGFM on iOS due to bug in webkitMike Greiling2018-01-241-0/+7
| | |
* | | Merge branch 'dispatcher-milestones-show-path' into 'master'Jacob Schatz2018-01-234-4/+22
|\ \ \ | | | | | | | | | | | | | | | | Refactor dispatcher milestones show path See merge request gitlab-org/gitlab-ce!16633
| * | | Refactor dispatcher milestones show pathdispatcher-milestones-show-pathClement Ho2018-01-224-4/+22
| | | |
* | | | remove webpack bundle tag for monitoring:environments:metricsSimon Knox2018-01-233-2/+10
| | | |
* | | | Merge branch 'dispatcher-new' into 'master'Clement Ho2018-01-233-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | consistent function exports for Labels edit/new pages See merge request gitlab-org/gitlab-ce!16635
| * | | | consistent function exports for Labels edit/new pagesdispatcher-newSimon Knox2018-01-233-3/+3
| | | | |
* | | | | Upgrade jasmine + raven to newer versionsTim Zallmann2018-01-231-2/+2
| | | | |
* | | | | Merge branch ↵Fatih Acet2018-01-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects Closes #42022 See merge request gitlab-org/gitlab-ce!16485
| * | | | | display "allow users to request access option" in public projectsMike Greiling2018-01-191-1/+1
| | |_|_|/ | |/| | |
* | | | | Upgraded all vue librariesTim Zallmann2018-01-232-4/+4
| | | | |
* | | | | Backport for Resolve "change status icon for reports when fails to be found ↵Filipa Lacerda2018-01-236-5/+8
| | | | | | | | | | | | | | | | | | | | or cannot load"
* | | | | Merge branch 'fix-callback-alignments' into 'master'Jacob Schatz2018-01-221-5/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix callback alignments See merge request gitlab-org/gitlab-ce!16596
| * | | | Fix callback alignmentsfix-callback-alignmentsClement Ho2018-01-191-5/+15
| |/ / /
* | | | Fix eslint UserCalloutfix-eslint-usercalloutClement Ho2018-01-221-1/+0
| | | |
* | | | Merge branch 'projects-r-s' into 'master'Jacob Schatz2018-01-229-38/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | refactor for projects-r*, s* See merge request gitlab-org/gitlab-ce!16351
| * | | | Fix eslintprojects-r-sClement Ho2018-01-191-2/+0
| | | | |
| * | | | Merge branch 'master' into projects-r-sClement Ho2018-01-1932-104/+274
| |\ \ \ \ | | |/ / /
| * | | | Add secretVariable testClement Ho2018-01-191-0/+6
| | | | |
| * | | | Fix eslintClement Ho2018-01-191-3/+1
| | | | |
| * | | | Merge branch 'master' into 'projects-r-s'Clement Ho2018-01-1921-95/+173
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | Fix referenceClement Ho2018-01-181-2/+2
| | | | | |
| * | | | | Fix eslintClement Ho2018-01-185-16/+4
| | | | | |
| * | | | | Code improvementsClement Ho2018-01-188-25/+14
| | | | | |
| * | | | | [skip ci] Improve dispatcherClement Ho2018-01-181-10/+2
| | | | | |
| * | | | | Add rest of refactor of dispatcher for project:s*Jacob Schatz2018-01-184-23/+51
| | | | | |
| * | | | | Refactor for projects:sJacob Schatz2018-01-186-4/+53
| | | | | |
| * | | | | refactor for projects-r*Jacob Schatz2018-01-182-2/+10
| | | | | |
* | | | | | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'Clement Ho2018-01-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading spinner not stop even on errors in the Issuable Templates Closes #40029 See merge request gitlab-org/gitlab-ce!16600
| * | | | | | Stop loading spinner on error of issuable templatesTakuya Noguchi2018-01-211-1/+1
| | | | | | |
* | | | | | | Merge branch 'dispatcher-ph-more' into 'master'Filipa Lacerda2018-01-224-16/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added dispatcher imports for sessions route See merge request gitlab-org/gitlab-ce!16608
| * | | | | | | Added dispatcher imports for sessions routedispatcher-ph-morePhil Hughes2018-01-224-16/+34
| | | | | | | |
* | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2213-13/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split the setup-test-env job in two Remove the wait time for the login form check Fix protected branches API to accept name parameter with dot Update outdated docs for CI/CD quick start _never_ unset gitlab.full_path Backport to match EE icons Add horizontal scroll to wiki tables Update best_practices.md Remove duplicate list item in "General Guidelines" Section. Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController Move rugged-call from Project#write_repository_config to Git::Repository#write_config doc: Spelling fixes Update Auto DevOps template Disable scss-lint around text-decoration-skip Add text-decoration-skip: ink to all underlined elements Fix Shows signin tab after new user email confirmation Fixes mistake in change log doc.
| * | | | | | | Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2211-11/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
| | * | | | | | | Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1911-11/+11
| | | | | | | | |
| * | | | | | | | Merge branch '41814-text-decoration-skip' into 'master'Phil Hughes2018-01-221-1/+7
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "introduce skip-ink underlines to improve readability dyslexic users" Closes #41814 See merge request gitlab-org/gitlab-ce!16569
| | * | | | | | | Disable scss-lint around text-decoration-skip41814-text-decoration-skipAnnabel Dunstone Gray2018-01-181-3/+3
| | | | | | | | |
| | * | | | | | | Add text-decoration-skip: ink to all underlined elementsAnnabel Dunstone Gray2018-01-181-1/+7
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'Clement Ho2018-01-201-2/+4
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "New user is sent back to Register tab after confirming email" Closes #41206 See merge request gitlab-org/gitlab-ce!16174
| | * | | | | | Fix Shows signin tab after new user email confirmationJacopo2018-01-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new user confirm his email the signin tab is correctly shown.
| * | | | | | | Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master'Annabel Dunstone Gray2018-01-191-0/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add horizontal scroll to wiki tables #26557 See merge request gitlab-org/gitlab-ce!16527
| | * | | | | | Add horizontal scroll to wiki tablesGeorge Tsiolis2018-01-191-0/+2
| | | | | | | |
* | | | | | | | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-1971-255/+503
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) WebIDE: Fix Commit bugs Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Fix incorrect path for gitlab-shell authorized keys helper Fix duplicate item in protected branch/tag dropdown dynamic imports for groups: pages Refactor dispatcher project mr edit and creation diff path Refactor dispatcher project mr creations new path Rework indexes on redirect_routes to be more effective and enforce a case insensitive unique path Upgraded Karma Dependencies Fix conflict with ee icon Remove trailing space after author name in note header Delete conflicting orphaned routes Make the 'Edit' links consistent in the issuable sidebar Fix a bug calculating artifact size for project statistics Update rubocop, rubocop-rspec, and gitlab-styles Correctly escape UTF-8 path elements for uploads Change cursor to default for disabled buttons Fix eslint Remove Event listener and make code more readable. Update CHANGELOG.md for 10.1.7 ...
| * | | | | | | Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-194-27/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move archived component to vue file See merge request gitlab-org/gitlab-ce!16561
| | * | | | | | | Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| | | | | | | | |
| | * | | | | | | Move archived component to vue fileFilipa Lacerda2018-01-184-27/+35
| | | |/ / / / / | | |/| | | | |
View Lorry Controller Status