Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'groups-webpack-bundle' into 'master' | Filipa Lacerda | 2018-01-24 | 12 | -16/+24 |
|\ | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644 | ||||
| * | fixed paginationgroups-webpack-bundle | Phil Hughes | 2018-01-23 | 1 | -3/+1 |
| | | |||||
| * | fixed group page specific JS | Phil Hughes | 2018-01-23 | 1 | -2/+0 |
| | | |||||
| * | Added dispatcher imports for groups webpack bundle | Phil Hughes | 2018-01-23 | 10 | -11/+23 |
| | | |||||
* | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master' | Rémy Coutable | 2018-01-24 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errors Closes #40771 See merge request gitlab-org/gitlab-ce!16664 | ||||
| * | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errors | Stan Hu | 2018-01-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The default 404 handler would return the Content-Type format based on the given format extension. This would cause the Rails CSRF protection to flag an error, since the .js extension gets mapped to text/javascript format. Closes #40771 | ||||
* | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master' | Filipa Lacerda | 2018-01-24 | 4 | -18/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640 | ||||
| * | | | added missing imports | Phil Hughes | 2018-01-24 | 1 | -0/+4 |
| | | | | |||||
| * | | | correctly imports performance bar | Phil Hughes | 2018-01-24 | 1 | -1/+0 |
| | | | | |||||
| * | | | Added imports for dispatcher routes | Phil Hughes | 2018-01-24 | 2 | -17/+7 |
| | | | | |||||
* | | | | Merge branch 'qa-deploy-key-factory-product' into 'master' | Grzegorz Bizon | 2018-01-24 | 1 | -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-product | Lin Jen-Shin | 2018-01-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Without this, it's very hard to locate it. | ||||
* | | | | | Merge branch '32546-cannot-copy-paste-on-ios' into 'master' | Phil Hughes | 2018-01-24 | 1 | -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 webkit | Mike Greiling | 2018-01-24 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge branch 'dispatcher-milestones-show-path' into 'master' | Jacob Schatz | 2018-01-23 | 4 | -4/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher milestones show path See merge request gitlab-org/gitlab-ce!16633 | ||||
| * | | | | | Refactor dispatcher milestones show pathdispatcher-milestones-show-path | Clement Ho | 2018-01-22 | 4 | -4/+22 |
| | | | | | | |||||
* | | | | | | remove webpack bundle tag for monitoring:environments:metrics | Simon Knox | 2018-01-23 | 4 | -3/+10 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master' | Phil Hughes | 2018-01-23 | 9 | -27/+26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust layout width for fixed layout #41830 Closes #41830 See merge request gitlab-org/gitlab-ce!16337 | ||||
| * | | | | | | Adjust last push notification width | George Tsiolis | 2018-01-23 | 9 | -27/+26 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dispatcher-new' into 'master' | Clement Ho | 2018-01-23 | 3 | -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-new | Simon Knox | 2018-01-23 | 3 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Upgrade jasmine + raven to newer versions | Tim Zallmann | 2018-01-23 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Fatih Acet | 2018-01-23 | 1 | -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 projects | Mike Greiling | 2018-01-19 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Upgraded all vue libraries | Tim Zallmann | 2018-01-23 | 2 | -4/+4 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Backport for Resolve "change status icon for reports when fails to be found ↵ | Filipa Lacerda | 2018-01-23 | 6 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | or cannot load" | ||||
* | | | | | | | Merge branch '42119-non-triggered' into 'master' | Grzegorz Bizon | 2018-01-23 | 2 | -5/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583 | ||||
| * | | | | | | Improve copy for the pending state42119-non-triggered | Filipa Lacerda | 2018-01-22 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Adds information for pending state | Filipa Lacerda | 2018-01-22 | 1 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | Do not render non triggered empty state for pending jobs | Filipa Lacerda | 2018-01-19 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back non triggered information | ||||
* | | | | | | | Merge branch ↵ | Robert Speicher | 2018-01-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595 | ||||
| * | | | | | | | remove redundant forked? check | Mike Greiling | 2018-01-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | ensure fork_source returns nil when project is the root fork, add tests | Mike Greiling | 2018-01-22 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix issue in which projects which have forks cannot be changed from private ↵ | Mike Greiling | 2018-01-19 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | to public | ||||
* | | | | | | | Merge branch 'fix-callback-alignments' into 'master' | Jacob Schatz | 2018-01-22 | 1 | -5/+15 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Fix callback alignments See merge request gitlab-org/gitlab-ce!16596 | ||||
| * | | | | | | Fix callback alignmentsfix-callback-alignments | Clement Ho | 2018-01-19 | 1 | -5/+15 |
| |/ / / / / | |||||
* | | | | | | Fix eslint UserCalloutfix-eslint-usercallout | Clement Ho | 2018-01-22 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Merge branch 'projects-r-s' into 'master' | Jacob Schatz | 2018-01-22 | 9 | -38/+93 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor for projects-r*, s* See merge request gitlab-org/gitlab-ce!16351 | ||||
| * | | | | | | Fix eslintprojects-r-s | Clement Ho | 2018-01-19 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into projects-r-s | Clement Ho | 2018-01-19 | 46 | -204/+420 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Add secretVariable test | Clement Ho | 2018-01-19 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Fix eslint | Clement Ho | 2018-01-19 | 1 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 'projects-r-s' | Clement Ho | 2018-01-19 | 27 | -102/+192 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js | ||||
| * | | | | | | | Fix reference | Clement Ho | 2018-01-18 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix eslint | Clement Ho | 2018-01-18 | 5 | -16/+4 |
| | | | | | | | | |||||
| * | | | | | | | Code improvements | Clement Ho | 2018-01-18 | 8 | -25/+14 |
| | | | | | | | | |||||
| * | | | | | | | [skip ci] Improve dispatcher | Clement Ho | 2018-01-18 | 1 | -10/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add rest of refactor of dispatcher for project:s* | Jacob Schatz | 2018-01-18 | 4 | -23/+51 |
| | | | | | | | | |||||
| * | | | | | | | Refactor for projects:s | Jacob Schatz | 2018-01-18 | 6 | -4/+53 |
| | | | | | | | | |||||
| * | | | | | | | refactor for projects-r* | Jacob Schatz | 2018-01-18 | 2 | -2/+10 |
| | | | | | | | |