summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve configs; merge master36828-create-a-common-docker-documentation-resource-docsJoshua Lambert2017-08-24286-841/+2397
|\
| * Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"Robert Speicher2017-08-256-13/+0
| | | | | | This reverts merge request !13813
| * Add missing third argument to `Git::Repository#initialize` in specRobert Speicher2017-08-241-1/+1
| |
| * Merge branch 'docs-article-gitlab-on-azure' into 'master'Achilleas Pipinellis2017-08-2432-2/+450
| |\ | | | | | | | | | | | | New doc: how to install GitLab on Azure See merge request !13811
| | * New doc: how to install GitLab on AzureMarcia Ramos2017-08-2432-2/+450
| |/
| * Merge branch 'rs-fix-master' into 'master'Stan Hu2017-08-241-2/+2
| |\ | | | | | | | | | | | | Add `:nested_groups` metadata to `Groups::NestedCreateService` specs See merge request !13809
| | * Add `:nested_groups` metadata to `Groups::NestedCreateService` specsRobert Speicher2017-08-241-2/+2
| | |
| * | Merge branch 'sh-sidekiq-backtrace' into 'master'Robert Speicher2017-08-246-0/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | Enable 5 lines of Sidekiq backtrace lines to aid in debugging Closes #27626 See merge request !13813
| | * Enable 5 lines of Sidekiq backtrace lines to aid in debuggingStan Hu2017-08-246-0/+13
| |/ | | | | | | | | | | | | | | | | | | Customers often have Sidekiq jobs that failed without much context. Without Sentry, there's no way to tell where these exceptions were hit. Adding in additional lines adds a bit more Redis storage overhead. This commit adds in backtrace logging for workers that delete groups/projects and import/export projects. Closes #27626
| * Merge branch 'bvl-alternative-fix-ldap-login' into 'master'docs-36116-install-gitlab-on-azureDouwe Maan2017-08-243-14/+8
| |\ | | | | | | | | | | | | Alternative fix for 422 when using standard login with ldap enabled See merge request !13103
| | * Define ldap methods at runtimeBob Van Landuyt2017-08-243-14/+8
| | | | | | | | | | | | | | | This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
| * | Merge branch '36589-hide-group-name-on-collapse' into 'master'Clement Ho2017-08-245-7/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
| | * | Hide group title on sidebar collapse; use more generic class for titles36589-hide-group-name-on-collapseAnnabel Dunstone Gray2017-08-235-7/+6
| | | |
| * | | Merge branch 'rs-remove-underscore-rails' into 'master'Clement Ho2017-08-242-5/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove underscore-rails gem Closes #36712 See merge request !13781
| | * | | Remove underscore-rails gemrs-remove-underscore-railsRobert Speicher2017-08-232-5/+0
| | | | | | | | | | | | | | | | | | | | We now manage this dependency in Yarn.
| * | | | Merge branch 'git-operation-user' into 'master'Sean McGivern2017-08-2437-127/+180
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Move GitHooksService into Gitlab::Git See merge request !13739
| | * | | Avoid committer = linesgit-operation-userJacob Vosmaer2017-08-242-21/+11
| | | | |
| | * | | Add tests for Committer#==Jacob Vosmaer2017-08-231-0/+22
| | | | |
| | * | | Fix Hook.new call sites in testsJacob Vosmaer2017-08-232-2/+2
| | | | |
| | * | | Rubocop whitespaceJacob Vosmaer2017-08-232-9/+8
| | | | |
| | * | | Move GitHooksService testsJacob Vosmaer2017-08-231-10/+8
| | | | |
| | * | | Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-2319-60/+65
| | | | |
| | * | | Make gl_repository a G::G::Repository attributeJacob Vosmaer2017-08-2318-48/+53
| | | | |
| | * | | Decouple GitOperationService from UserJacob Vosmaer2017-08-235-26/+60
| | | | |
| * | | | Merge branch 'font-weight-adjusted' into 'master'Annabel Dunstone Gray2017-08-2474-223/+230
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed all font-weight values to 400 and 600 Closes #34138 See merge request !12896
| | * | | | Changed all font-weight values to 400 and 600Dimitrie Hoekstra2017-08-2474-223/+230
| |/ / / /
| * | | | Merge branch ↵Kamil Trzciński2017-08-242-107/+93
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rb' into 'master' Reorganizes spec: spec/features/runners_spec.rb Closes #36731 See merge request !13716
| | * | | | Fix testsfix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rbShinya Maeda2017-08-231-29/+32
| | | | | |
| | * | | | Refurbish spec/features/runners_spec.rbShinya Maeda2017-08-232-109/+92
| | |/ / /
| * | | | Merge branch 'backstage/gb/after-save-asynchronous-job-hooks' into 'master'Kamil Trzciński2017-08-246-3/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not fire synchronous hooks when creating a job Closes #35286 See merge request !13734
| | * | | | Fix feature specs for pages deploymentbackstage/gb/after-save-asynchronous-job-hooksGrzegorz Bizon2017-08-231-1/+5
| | | | | |
| | * | | | Fix cycle analytics test data generation and specsGrzegorz Bizon2017-08-231-0/+2
| | | | | |
| | * | | | Merge branch 'master' into backstage/gb/after-save-asynchronous-job-hooksGrzegorz Bizon2017-08-23117-2255/+1506
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (115 commits) Use event-based waiting in Gitlab::JobWaiter Make sure repository's removal work for legacy and hashed storages Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones Refactor project and storage types Prevent using gitlab import task when hashed storage is enabled Some codestyle changes and fixes for GitLab pages Removed some useless code, codestyle changes and removed an index Fix repository reloading in some specs Changelog Moving away from the "extend" based factory to a more traditional one. Enable automatic hashed storage for new projects by application settings New storage is now "Hashed" instead of "UUID" Add UUID Storage to Project Move create_repository back to project model as we can use disk_path and share it Codestyle: move hooks to the same place and move dependent methods to private Use non-i18n values for setting new group-level issue/MR button text indexes external issue tracker copyedit indexes user/search/ from /user/index Correctly encode string params for Gitaly's TreeEntries RPC ...
| | * | | | | Fix pipeline job worker specsGrzegorz Bizon2017-08-231-1/+1
| | | | | | |
| | * | | | | Run job hooks after transation commits after createGrzegorz Bizon2017-08-231-1/+1
| | | | | | |
| | * | | | | Add changelog for asynchronous job events fixGrzegorz Bizon2017-08-221-0/+5
| | | | | | |
| | * | | | | Do not fire synrchonous hooks when creating a jobGrzegorz Bizon2017-08-222-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fire asynchronous hooks instead.
| * | | | | | Merge branch 'thenable-ajax-api-calls' into 'master'Fatih Acet2017-08-245-20/+72
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thenable ajax api calls See merge request !13427
| | * | | | | | Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ↵thenable-ajax-api-callsLuke "Jared" Bennett2017-08-233-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec
| | * | | | | | Update repo_commit_section to spy serviceLuke "Jared" Bennett2017-08-231-6/+5
| | | | | | | |
| | * | | | | | fix failing specs in repo_commit_section_spec.jsMike Greiling2017-08-181-1/+1
| | | | | | | |
| | * | | | | | fix eslint violations in repo editor filesMike Greiling2017-08-173-10/+12
| | | | | | | |
| | * | | | | | Add thenable ajax calls.Jacob Schatz2017-08-173-9/+8
| | | | | | | |
| * | | | | | | Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-243-5/+70
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix old MR diffs Closes #36516 See merge request !13744
| | * | | | | | | Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-243-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some old merge requests, we don't have enough information to figure out the old blob and the new blob for the file. This means that we can't highlight the diff correctly, but we can still display it without highlighting.
| | * | | | | | | Always return a simple diff viewerSean McGivern2017-08-222-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't have a fallback case before, because we believed the conditions were exhaustive. They weren't, so we can always fallback to not previewing.
| * | | | | | | | Merge branch 'archived-projects-only' into 'master'Douwe Maan2017-08-2410-31/+110
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to list only archived projects Closes #35994 See merge request !13492
| | * | | | | | | | Add an option to list only archived projectsMehdi Lahmam2017-08-249-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35994
| | * | | | | | | | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-242-26/+54
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'an-gitaly-ref-exists-extras' into 'master'Sean McGivern2017-08-247-7/+65
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::Git Closes gitaly#488 See merge request !13725
View Lorry Controller Status