Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify checking if objects exist code in new issaubles workers36119-issuable-workers | Jarka Kadlecova | 2017-08-08 | 6 | -13/+22 |
| | |||||
* | Merge branch '24685_view_self' into 'master' | Jacob Schatz | 2017-08-08 | 6 | -22/+35 |
|\ | | | | | | | | | Show all labels See merge request !13303 | ||||
| * | Show all labels | Regis Boudinot | 2017-08-08 | 6 | -22/+35 |
|/ | |||||
* | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 29 | -55/+196 |
|\ | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207 | ||||
| * | Exclude merge_jid on Import/Export attribute configuration | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+1 |
| | | |||||
| * | Re-add column locked_at on migration rollback31207-clean-locked-merge-requests | Oswaldo Ferreira | 2017-08-07 | 1 | -1/+1 |
| | | |||||
| * | Move locked_at removal to post-deployment migration | Oswaldo Ferreira | 2017-08-07 | 3 | -2/+3 |
| | | |||||
| * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 28 | -54/+193 |
| | | |||||
* | | Merge branch '33874_confi' into 'master' | Jacob Schatz | 2017-08-07 | 14 | -28/+434 |
|\ \ | | | | | | | | | | | | | 33874 confidential issue redesign See merge request !12801 | ||||
| * | | 33874 confidential issue redesign | Regis Boudinot | 2017-08-07 | 14 | -28/+434 |
|/ / | |||||
* | | Merge branch ↵ | Clement Ho | 2017-08-07 | 4 | -3/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-master' into 'master' Resolve "User dropdown in filtered search does not load avatar on `master`" Closes #35729 See merge request !13181 | ||||
| * | | Resolve "User dropdown in filtered search does not load avatar on `master`" | Tim Zallmann | 2017-08-07 | 4 | -3/+7 |
|/ / | |||||
* | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master' | Robert Speicher | 2017-08-07 | 3 | -20/+63 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268 | ||||
| * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitaly | Ahmad Sherif | 2017-08-07 | 6 | -24/+67 |
| |/ | | | | | | | Closes gitaly#443 | ||||
* | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master' | Robert Speicher | 2017-08-07 | 5 | -5/+25 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259 | ||||
| * | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitaly | Ahmad Sherif | 2017-08-07 | 5 | -5/+25 |
| |/ | | | | | | | Closes gitaly#437 | ||||
* | | Merge branch '32844-issuables-performance' into 'master' | Sean McGivern | 2017-08-07 | 14 | -14/+198 |
|\ \ | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326 | ||||
| * | | Move some after_create parts to worker to improve performance32844-issuables-performance | Jarka Kadlecova | 2017-08-07 | 14 | -14/+198 |
| | | | |||||
* | | | Merge branch 'perf.policy-runner-reduce-loops' into 'master' | Sean McGivern | 2017-08-07 | 1 | -5/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | DeclarativePolicy: reduce iterations of the step set See merge request !13352 | ||||
| * | | | more eagerly bail when the state is prevented | http://jneen.net/ | 2017-08-07 | 1 | -4/+3 |
| | | | | |||||
| * | | | reduce iterations by keeping a count of remaining enablers | http://jneen.net/ | 2017-08-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | rather than iterating the whole remaining step set with .all?(&:prevent?) | ||||
* | | | | Merge branch 'zj-add-ci-metrics' into 'master' | Sean McGivern | 2017-08-07 | 2 | -0/+42 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add two more metrics for CI/CD See merge request !13039 | ||||
| * | | | | Add two more metrics for CI/CDzj-add-ci-metrics | Z.J. van de Weg | 2017-07-31 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard right now to determine what is a good metric and whats not, these two are not listed in the docs, nor will they get a CHANGELOG entry. | ||||
* | | | | | Merge branch 'collapse-sidebar-bugs' into 'master' | Phil Hughes | 2017-08-07 | 8 | -7/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347 | ||||
| * | | | | | Add class to other sidebars | Annabel Dunstone Gray | 2017-08-07 | 3 | -3/+3 |
| | | | | | | |||||
| * | | | | | Check if sidebar existscollapse-sidebar-bugs | Annabel Dunstone Gray | 2017-08-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove JS flicker on page load; UI tweaks | Annabel Dunstone Gray | 2017-08-07 | 5 | -4/+12 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'group-new-issue' into 'master' | Clement Ho | 2017-08-07 | 9 | -18/+251 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group-level new issue & MR using previously selected project Closes #34411 See merge request !13058 | ||||
| * | | | | | Group-level new issue & MR using previously selected project | Bryce Johnson | 2017-08-07 | 9 | -18/+251 |
|/ / / / / | |||||
* | | | | | Merge branch '35761-convdev-perc' into 'master' | Sean McGivern | 2017-08-07 | 11 | -16/+159 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store & use ConvDev percentages returned by Version app Closes #35761 See merge request !13217 | ||||
| * | | | | | Store & use ConvDev percentages returned by Version app35761-convdev-perc | Jarka Kadlecova | 2017-08-07 | 11 | -16/+159 |
| | | | | | | |||||
* | | | | | | Merge branch 'feature/log-provider' into 'master' | Sean McGivern | 2017-08-07 | 1 | -6/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EE Backport] Update log audit event in omniauth_callbacks_controller.rb See merge request !13339 | ||||
| * | | | | | | [EE Backport] Update log audit event in omniauth_callbacks_controller.rb | James Lopez | 2017-08-07 | 1 | -6/+15 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'backport-ee-2251' into 'master' | Sean McGivern | 2017-08-07 | 10 | -75/+233 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275 | ||||
| * | | | | | | Backport changes in ↵ | Nick Thomas | 2017-08-07 | 10 | -75/+233 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE | ||||
* | | | | | | | Merge branch 'blob-batch-methods' into 'master' | Douwe Maan | 2017-08-07 | 2 | -60/+147 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225 | ||||
| * | | | | | | | Rename 'limit' to 'blob_size_limit' | Jacob Vosmaer | 2017-08-07 | 2 | -12/+11 |
| | | | | | | | | |||||
| * | | | | | | | Add Gitlab::Git::Blob.batch method | Jacob Vosmaer | 2017-08-01 | 2 | -60/+148 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '35483-improve-mobile-sidebar' into 'master' | Phil Hughes | 2017-08-07 | 7 | -42/+31 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile sidebar Closes #35483 See merge request !13349 | ||||
| * | | | | | | | | Improve mobile sidebar | Annabel Dunstone Gray | 2017-08-07 | 7 | -42/+31 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master' | Phil Hughes | 2017-08-07 | 16 | -3761/+139 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262 | ||||
| * | | | | | | | | remove sidebar height management from wikis sidebar | Mike Greiling | 2017-08-07 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | fix failing specs due phantomJS scroll position | Mike Greiling | 2017-08-04 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fix sidebar job list in IE 11 | Mike Greiling | 2017-08-04 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | remove nicescroll from jobs page and remove the library from common.bundle.js | Mike Greiling | 2017-08-04 | 10 | -3737/+98 |
| | | | | | | | | | |||||
| * | | | | | | | | remove nicescroll from wiki sidebar | Mike Greiling | 2017-08-04 | 3 | -18/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | remove niceScroll from job trigger variables list | Mike Greiling | 2017-08-04 | 3 | -6/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '33902-upgrade-to-webpack-v3' into 'master' | Jacob Schatz | 2017-08-07 | 4 | -113/+500 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to webpack v3.4.0 Closes #33902 See merge request !12298 | ||||
| * | | | | | | | | | add thunky to approved licenses (MIT) | Mike Greiling | 2017-08-07 | 1 | -0/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | dedupe yarn dependencies | Mike Greiling | 2017-08-07 | 1 | -23/+3 |
| | | | | | | | | | |