summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change commits/signatures method to accept array of shawinh-gpg-status-repositoryDmitriy Zaporozhets2017-08-113-27/+41
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Disable Ajax request for GPG status on repository and search pagewinh2017-08-087-9/+11
|
* Add failing test for #35699winh2017-08-087-0/+162
|
* Merge branch 'document-and-test-api-iids' into 'master'Rémy Coutable2017-08-084-8/+8
|\ | | | | | | | | Fix the iids parameters in the API documentation See merge request !13340
| * Fix the iids parameters in the API documentationFrank Pavageau2017-08-074-8/+8
| | | | | | | | | | Since the parameter name is really `iids[]`, it should be used consistently across the documentation.
* | Merge branch 'ide' into 'master'Mike Greiling2017-08-08101-239/+3706
|\ \ | | | | | | | | | | | | | | | | | | Add Multi-File Editor Using Monaco/VSCode Closes #31890 See merge request !12198
| * \ Merge branch 'master' into ideMike Greiling2017-08-07204-4690/+3960
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
* | | Merge branch '24685_view_self' into 'master'Jacob Schatz2017-08-086-22/+35
|\ \ \ | | | | | | | | | | | | | | | | Show all labels See merge request !13303
| * | | Show all labelsRegis Boudinot2017-08-086-22/+35
|/ / /
* | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0829-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 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 redesign See merge request !12801
| * | | | 33874 confidential issue redesignRegis Boudinot2017-08-0714-28/+434
|/ / / /
* | | | Merge branch ↵Clement Ho2017-08-074-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 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 Gitaly Closes gitaly#443 See merge request !13268
| * | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-076-24/+67
| |/ / / | | | | | | | | | | | | Closes gitaly#443
* | | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-075-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-gitalyAhmad Sherif2017-08-075-5/+25
| |/ / / | | | | | | | | | | | | Closes gitaly#437
* | | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-0714-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-performanceJarka Kadlecova2017-08-0714-14/+198
| | | | |
* | | | | Merge branch 'perf.policy-runner-reduce-loops' into 'master'Sean McGivern2017-08-071-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | DeclarativePolicy: reduce iterations of the step set See merge request !13352
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than iterating the whole remaining step set with .all?(&:prevent?)
* | | | | | Merge branch 'zj-add-ci-metrics' into 'master'Sean McGivern2017-08-072-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two more metrics for CI/CD See merge request !13039
| * | | | | | Add two more metrics for CI/CDzj-add-ci-metricsZ.J. van de Weg2017-07-312-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 Hughes2017-08-078-7/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| * | | | | | | 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 project Closes #34411 See merge request !13058
| * | | | | | 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 app Closes #35761 See merge request !13217
| * | | | | | 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.rb See merge request !13339
| * | | | | | | [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/2551 to CE Closes #21391 See merge request !13275
| * | | | | | | Backport changes in ↵Nick Thomas2017-08-0710-75/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* | | | | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-072-60/+147
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| * | | | | | | | 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 sidebar Closes #35483 See merge request !13349
| * | | | | | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-077-42/+31
|/ / / / / / / / /
* | | | | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0716-3761/+139
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| * | | | | | | | | 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
| | | | | | | | | |