summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'revert-appearances-description-html-not-null' into 'master'Douwe Maan2017-08-254-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-allow appearances.description_html to be NULL Closes #36919 See merge request !13806
| * | | | | | | | | | | | | | | | | | | Re-allow appearances.description_html to be NULLrevert-appearances-description-html-not-nullYorick Peterse2017-08-244-3/+26
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column isn't always set (e.g. when upgrading from older instances) and technically it could be NULL (e.g. when flushing the cache). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36919
* | | | | | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-invalid-stage-status-transition' into 'master'Kamil Trzciński2017-08-252-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a default CI/CD status when it is not known Closes #36790 See merge request !13737
| * | | | | | | | | | | | | | | | | | Set a default CI/CD status when it is not knownfix/gb/fix-invalid-stage-status-transitionGrzegorz Bizon2017-08-222-0/+15
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '36937-fix-invite-by-email-text' into 'master'Tim Zallmann2017-08-252-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invite by email address duplication Closes #36937 See merge request !13826
| * | | | | | | | | | | | | | | | | | | Fix invite by email address duplicationMark Fletcher2017-08-252-3/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-gem-rename' into 'master'Sean McGivern2017-08-252-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly-proto 0.31.0 See merge request !13795
| * | | | | | | | | | | | | | | | | | | Use gitaly-proto 0.31.0gitaly-gem-renameJacob Vosmaer2017-08-242-3/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'Douwe Maan2017-08-254-17/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword job to pipeline on the chart view Closes #36928 See merge request !13786
| * | | | | | | | | | | | | | | | | | | | Reword job to pipeline on the chart viewZeger-Jan van de Weg2017-08-244-17/+22
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got changed for i18n in !12480, however, I forgot to understand that the meaning of the graphs changed in !12378. This corrects the behaviour.
* | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'"Douwe Maan2017-08-252-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !13812
* | | | | | | | | | | | | | | | | | | | Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'Douwe Maan2017-08-252-19/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reenable MySQL tests on all CE and EE branches Closes #36384 See merge request !13812
| * | | | | | | | | | | | | | | | | | | | Reenable MySQL tests on all branchesMichael Kozono2017-08-242-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To protect master from surprise failures, as long as we continue to support MySQL.
* | | | | | | | | | | | | | | | | | | | | 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