summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Updates contribution calendar to work with days when you are on fireJacob Schatz2018-01-261-7/+14
|
* Merge branch 'qa-deploy-key-scenario' into 'master'Grzegorz Bizon2018-01-251-2/+2
|\ | | | | | | | | Generate ssh key on the fly for QA See merge request gitlab-org/gitlab-ce!16562
| * Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenarioLin Jen-Shin2018-01-2451-163/+299
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (106 commits) Remove callback as we already update accordingly on services added missing imports correctly imports performance bar Added imports for dispatcher routes Make the exposing of the Application secret more explicit Add documentation about when the application API was added Add application create API Return a blank JSON response for a missing .js file to prevent Rails CSRF errors add CHANGELOG.md entry for !15804 disable CopyAsGFM on iOS due to bug in webkit Update changelog GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side Return more consistent values for merge_status on MR API Fix a migration spec messing up the MergeRequestDiff DB schema Backport changes to Gitlab::Checks::ChangeAccess from EE remove webpack bundle tag for monitoring:environments:metrics Set timezone for karma to UTC Upgrade jasmine + raven to newer versions Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze ...
| * | Also test if the fingerprint is correctLin Jen-Shin2018-01-221-2/+2
| | |
| * | Merge branch 'qa-deploy-key-factory-product' into qa-deploy-key-scenarioLin Jen-Shin2018-01-221-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | * qa-deploy-key-factory-product: Add .qa-project-deploy-keys to locate it Scrap the deploy key title and match it in test
* | \ \ Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-2523-84/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Moves status icon into a vue file and adds tests See merge request gitlab-org/gitlab-ce!16703
| * | | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-253-3/+3
| | | | |
| * | | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-257-103/+135
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Migrate repository bundling to Gitaly Use limit for search count queries Fix offense in runners settings QA page object class Wait for runner until it registers itself in QA tests Fix static-analysis offenses in QA support class Add specific views / selectors for QA runners page Add views / selectors for pipeline show page object ...
| * | | | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2423-84/+111
| | |_|_|/ | |/| | | | | | | | | | | | | Moves merging component into a vue file, adds i18n and better test cases
* | | | | Merge branch 'winh-delete-milestone-modal' into 'master'Phil Hughes2018-01-259-3/+217
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modal for deleting a milestone Closes #41314 See merge request gitlab-org/gitlab-ce!16229
| * | | | | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-259-3/+217
| | |/ / / | |/| | |
* | | | | Merge branch '42285-not-found-status-icon' into 'master'Phil Hughes2018-01-251-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "generalise not found status icon color throughout application" Closes #42285 See merge request gitlab-org/gitlab-ce!16679
| * | | | | Uses sprite icon to render verified commit badge and uniforms css colors42285-not-found-status-iconFilipa Lacerda2018-01-241-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch '42220-add-pending-empty-state' into 'master'Tim Zallmann2018-01-252-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add empty state for pending job" Closes #42220 See merge request gitlab-org/gitlab-ce!16646
| * | | | Adds correct illustration for pending state42220-add-pending-empty-stateFilipa Lacerda2018-01-232-1/+2
| | | | |
* | | | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-257-103/+135
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16677
| * | | | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-247-103/+135
| | | | | | | | | | | | | | | | | | | | | | | | | Adds i18n Adds better test coverage
* | | | | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-246-5/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644
| * | | | | fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
| | | | | |
| * | | | | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-235-2/+17
| | | | | |
* | | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master'Filipa Lacerda2018-01-243-17/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640
| * | | | | added missing importsPhil Hughes2018-01-241-0/+4
| | | | | |
| * | | | | Added imports for dispatcher routesPhil Hughes2018-01-242-17/+7
| | | | | |
* | | | | | 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
| | | | | | |
View Lorry Controller Status