summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusingSean McGivern2017-08-091-1/+1
|\ | | | | | | | | Rename RPC 'Exists' to 'RepositoryExists' See merge request !13277
| * Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-1/+1
| |
* | Merge branch 'fix-gitlab-pages-cache-config' into 'master'Grzegorz Bizon2017-08-092-2/+8
|\ \ | | | | | | | | | | | | Fix proxy config in Gitlab Pages nginx examples See merge request !13375
| * | Fix proxy config in Gitlab Pages nginx examplesNick Thomas2017-08-082-2/+8
| | |
* | | Merge branch '36003-do-not-include-to-kernel' into 'master'Robert Speicher2017-08-093-13/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Don't include anything to Kernel only because of tasks Closes #36003 See merge request !13380
| * | We shouldn't include utility methods everywhereLin Jen-Shin2017-08-081-0/+2
| | |
| * | Just extend main, rather than include to KernelLin Jen-Shin2017-08-082-13/+1
| | | | | | | | | | | | | | | | | | | | | Unfortunately rake doesn't have nested context, everything just runs on a main rake object. This is probably due to compatibility issue, but anyway, we could just extend the object.
* | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-095-7/+8
|\ \ \ | | | | | | | | | | | | | | | | Enable the Layout/SpaceBeforeBlockBraces cop See merge request !13413
| * | | Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-094-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
|/ / /
* | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-14/+16
|\ \ \ | | | | | | | | | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-14/+16
| | | |
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Unset BUNDLE_GEMFILE when installing Gitaly See merge request !13378
| * | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-081-1/+1
| | | |
* | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0811-89/+108
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-074-22/+55
| | | |
| * | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
| * | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-078-45/+20
| | | |
* | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-081-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990
| * | | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is recommended that we set this to 50: https://gitlab.com/gitlab-org/gitlab-ce/issues/35098#note_35036746 In this particular issue, the confidence was 42 for Shift JIS, but in fact that's encoded in UTF-8 just with a single bad character. In this case, we shouldn't try to treat it as Shift JIS, but just treat it as UTF-8 and remove invalid bytes. Treating it like Shift JIS would corrupt the whole data. Unfortunately, the diff which would cause this could not be disclosed therefore we can't use it as a test example.
* | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-081-16/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
| * | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
| |/ / | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
| * | | Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
| | | |
* | | | Expose noteable_iid in Notesue4452017-08-081-0/+6
| | | |
* | | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-082-7/+9
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
| * | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵Rémy Coutable2017-08-082-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵Rémy Coutable2017-08-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
| * | | Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
* | | | Merge branch 'master' into ideMike Greiling2017-08-0719-239/+530
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-0/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes gitaly#443
| * | | | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-072-1/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-1/+21
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes gitaly#437
| * | | | | 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 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-45/+50
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-45/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
| * | | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-60/+76
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| | * | | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-7/+6
| | | | | | | |
| | * | | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-60/+77
| | | | | | | |
| * | | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-074-20/+55
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| | * | | | | | | Change `project.path_with_namespace` to `project.disk_path`Douglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | |
| | * | | | | | | Allow users to disable SSL verification if not connecting to github.comDouglas Barbosa Alexandre2017-08-071-4/+15
| | | | | | | | |
View Lorry Controller Status