summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-086-13/+22
* Merge branch '24685_view_self' into 'master'Jacob Schatz2017-08-086-22/+35
|\
| * Show all labelsRegis Boudinot2017-08-086-22/+35
|/
* Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0829-55/+196
|\
| * Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
| * Re-add column locked_at on migration rollback31207-clean-locked-merge-requestsOswaldo Ferreira2017-08-071-1/+1
| * Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-073-2/+3
| * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0728-54/+193
* | Merge branch '33874_confi' into 'master'Jacob Schatz2017-08-0714-28/+434
|\ \
| * | 33874 confidential issue redesignRegis Boudinot2017-08-0714-28/+434
|/ /
* | Merge branch '35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-...Clement Ho2017-08-074-3/+7
|\ \
| * | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-074-3/+7
|/ /
* | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-073-20/+63
|\ \
| * | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-076-24/+67
| |/
* | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-075-5/+25
|\ \
| * | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-075-5/+25
| |/
* | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-0714-14/+198
|\ \
| * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-0714-14/+198
* | | Merge branch 'perf.policy-runner-reduce-loops' into 'master'Sean McGivern2017-08-071-5/+7
|\ \ \
| * | | more eagerly bail when the state is preventedhttp://jneen.net/2017-08-071-4/+3
| * | | reduce iterations by keeping a count of remaining enablershttp://jneen.net/2017-08-071-1/+4
* | | | Merge branch 'zj-add-ci-metrics' into 'master'Sean McGivern2017-08-072-0/+42
|\ \ \ \
| * | | | Add two more metrics for CI/CDzj-add-ci-metricsZ.J. van de Weg2017-07-312-0/+42
* | | | | Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-078-7/+15
|\ \ \ \ \
| * | | | | Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| * | | | | Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| * | | | | Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-075-4/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'group-new-issue' into 'master'Clement Ho2017-08-079-18/+251
|\ \ \ \ \
| * | | | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-079-18/+251
|/ / / / /
* | | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-0711-16/+159
|\ \ \ \ \
| * | | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-0711-16/+159
* | | | | | Merge branch 'feature/log-provider' into 'master'Sean McGivern2017-08-071-6/+15
|\ \ \ \ \ \
| * | | | | | [EE Backport] Update log audit event in omniauth_callbacks_controller.rbJames Lopez2017-08-071-6/+15
|/ / / / / /
* | | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-0710-75/+233
|\ \ \ \ \ \
| * | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-0710-75/+233
* | | | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-072-60/+147
|\ \ \ \ \ \ \
| * | | | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-072-12/+11
| * | | | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-012-60/+148
* | | | | | | | Merge branch '35483-improve-mobile-sidebar' into 'master'Phil Hughes2017-08-077-42/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-077-42/+31
|/ / / / / / / /
* | | | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0716-3761/+139
|\ \ \ \ \ \ \ \
| * | | | | | | | remove sidebar height management from wikis sidebarMike Greiling2017-08-071-1/+0
| * | | | | | | | fix failing specs due phantomJS scroll positionMike Greiling2017-08-041-4/+4
| * | | | | | | | fix sidebar job list in IE 11Mike Greiling2017-08-041-0/+2
| * | | | | | | | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-0410-3737/+98
| * | | | | | | | remove nicescroll from wiki sidebarMike Greiling2017-08-043-18/+27
| * | | | | | | | remove niceScroll from job trigger variables listMike Greiling2017-08-043-6/+13
* | | | | | | | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-074-113/+500
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| * | | | | | | | | dedupe yarn dependenciesMike Greiling2017-08-071-23/+3
View Lorry Controller Status