summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use `EXISTS` to load projects from owned groupsbvl-optimize-owned-projects-queryBob Van Landuyt2018-03-132-4/+15
| | | | This should be more efficient than the old `namespace_id IN` query.
* Merge branch '43720-update-fe-webpack-docs' into 'master'Jacob Schatz2018-03-137-68/+118
|\ | | | | | | | | | | | | Resolve "Document webpack_bundle_tag replacement method" Closes #43720 and #42704 See merge request gitlab-org/gitlab-ce!17706
| * move tip into blockquote43720-update-fe-webpack-docsMike Greiling2018-03-121-8/+5
| |
| * specify that webpack entry points are exempt from unit tests, not ↵Mike Greiling2018-03-121-4/+4
| | | | | | | | integration tests
| * address wording feedbackMike Greiling2018-03-121-9/+9
| |
| * update node and yarn dependencies within install/upgrade docsMike Greiling2018-03-124-13/+20
| |
| * update EE features frontend section to point to performance.md for info on ↵Mike Greiling2018-03-121-15/+3
| | | | | | | | page-specific EE code
| * differentiate image lazy-loading from code splittingMike Greiling2018-03-121-1/+1
| |
| * emphasize headings for each page-specific-javascript tipMike Greiling2018-03-121-19/+24
| |
| * add section for universal codeMike Greiling2018-03-121-5/+9
| |
| * rewrite docs for page-specific-javascriptMike Greiling2018-03-121-34/+88
| |
| * remove deprecated page_specific_javascript_bundle_tagMike Greiling2018-03-121-5/+0
| |
* | Merge branch '44149-issue-comment-buttons' into 'master'Phil Hughes2018-03-139-7/+134
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Wrong button has the loading state when submitting a comment in issues" Closes #44149 See merge request gitlab-org/gitlab-ce!17698
| * | Use mapState instead of a getterFilipa Lacerda2018-03-132-2/+3
| | |
| * | Merge branch 'master' into 44149-issue-comment-buttonsFilipa Lacerda2018-03-1360-198/+630
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ...
* | | Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-128-18/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| * | | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-128-18/+46
| | | | | | | | | | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* | | | Merge branch 'ab-44121-post-deploy-migrations-time-format' into 'master'Yorick Peterse2018-03-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timestamp to include %M instead of %I for post-deploy migrations. Closes #44121 See merge request gitlab-org/gitlab-ce!17699
| * | | | Fix timestamp to include %M instead of %I for post-deploy migrations.ab-44121-post-deploy-migrations-time-formatAndreas Brandl2018-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #44121.
* | | | | Merge branch 'fl-update-svg' into 'master'Clement Ho2018-03-122-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency for svgs See merge request gitlab-org/gitlab-ce!17701
| * | | | | Update dependency for svgsFilipa Lacerda2018-03-122-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bvl-inconsistent-spelling-in-mr-form' into 'master'Douwe Maan2018-03-123-20/+90
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix inconsistent punctuation on MR form See merge request gitlab-org/gitlab-ce!17702
| * | | | Fix inconsistent punctuation on MR formBob Van Landuyt2018-03-123-20/+90
|/ / / /
* | | | Merge branch 'gitaly-0.89.0' into 'master'Robert Speicher2018-03-121-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Use Gitaly 0.89.0 See merge request gitlab-org/gitlab-ce!17696
| * | | Use Gitaly 0.89.0Jacob Vosmaer2018-03-121-1/+1
| | | |
* | | | Merge branch 'sh-bump-ruby-parser' into 'master'Robert Speicher2018-03-121-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump parser and unparser gems to remove warnings See merge request gitlab-org/gitlab-ce!17673
| * | | | Bump parser and unparser gems to remove warningssh-bump-ruby-parserStan Hu2018-03-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings would show when running rspec: ``` warning: parser/current is loading parser/ruby23, which recognizes warning: 2.3.5-compliant syntax, but you are running 2.3.6. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri. ``` Related PRs: * https://github.com/whitequark/parser/pull/422 * https://github.com/mbj/unparser/pull/79
* | | | | Merge branch 'allow-ee-in-backtraces' into 'master'Robert Speicher2018-03-123-8/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the ee/ directory in backtraces Closes gitlab-ee#5204 See merge request gitlab-org/gitlab-ce!17664
| * | | | | Include the ee/ directory in backtracesallow-ee-in-backtracesSean McGivern2018-03-123-8/+6
| | | | | |
* | | | | | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into ↵Clement Ho2018-03-125-48/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move NothingToMerge vue component See merge request gitlab-org/gitlab-ce!17544
| * | | | | | Move NothingToMerge vue componentGeorge Tsiolis2018-03-085-48/+56
| | | | | | |
* | | | | | | Merge branch 'removes-source-branch-widget-state' into 'master'Filipa Lacerda2018-03-124-1/+41
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix removes source branch text being rendered in merged state Closes #44163 See merge request gitlab-org/gitlab-ce!17687
| * | | | | | fixed specPhil Hughes2018-03-121-0/+1
| | | | | | |
| * | | | | | Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-124-1/+40
| | | | | | |
* | | | | | | Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-127-17/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
| * | | | | | | fixed note polling not sending updated last fetched at datefix-duplicate-notesPhil Hughes2018-03-124-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added spec for polling
| * | | | | | | added mutation specPhil Hughes2018-03-102-8/+21
| | | | | | | |
| * | | | | | | fix polling not working correctlyPhil Hughes2018-03-091-1/+1
| | | | | | | |
| * | | | | | | Fixed issue notes being duplicatedPhil Hughes2018-03-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44099
* | | | | | | | Merge branch '42579-fix-sidebar-dropdown-hover-style' into 'master'Phil Hughes2018-03-122-13/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Hover style for sidebar dropdowns is wrong" Closes #42579 See merge request gitlab-org/gitlab-ce!17519
| * | | | | | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-122-13/+32
|/ / / / / / / /
* | | | | | | | Merge branch 'tc-api-fix-expose_url' into 'master'Stan Hu2018-03-123-1/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the protocol in `expose_url` Closes gitlab-ee#5217 See merge request gitlab-org/gitlab-ce!17681
| * | | | | | | | Respect the protocol in `expose_url`Toon Claes2018-03-123-1/+47
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When https is configured in the URL, also use that, and do not set it to http. Closes gitlab-org/gitlab-ee#5217
* | | | | | | | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-125-34/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
| * | | | | | | | Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loadingOswaldo Ferreira2018-03-082-36/+19
| | | | | | | | |
| * | | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-075-19/+67
| | | | | | | | |
* | | | | | | | | Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'Yorick Peterse2018-03-123-1/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add partial indexes on todos to handle users with many todos See merge request gitlab-org/gitlab-ce!17668
| * | | | | | | | | Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-seanGreg Stark2018-03-093-1/+36
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-123-4/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code and wiki search results when filename is non-ASCII See merge request gitlab-org/gitlab-ce!17685
| * | | | | | | | | | Fix code and wiki search results when filename is non-ASCIISean McGivern2018-03-123-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we only handled non-ASCII file contents, but the name itself can be non-ASCII.
View Lorry Controller Status