summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-enable-frozen-literals-banzi-filters' into 'master'Rémy Coutable2018-07-233-3/+9
|\
| * Enable frozen strings in remaining lib/banzai/filter/*.rb filessh-enable-frozen-literals-banzi-filtersStan Hu2018-07-233-3/+9
* | Merge branch 'sh-freeze-banzai-filter-strings' into 'master'Rémy Coutable2018-07-2338-0/+76
|\ \
| * | Enable frozen strings in lib/banzai/filter/*.rbsh-freeze-banzai-filter-stringsStan Hu2018-07-2338-0/+76
| |/
* | Merge branch 'da-feature-flags' into 'master'Rémy Coutable2018-07-231-1/+1
|\ \
| * | Allow feature flag names to be a symbolda-feature-flagsDouglas Barbosa Alexandre2018-07-191-1/+1
* | | Merge branch 'gitaly-add-remote-mandatory' into 'master'Sean McGivern2018-07-231-8/+0
|\ \ \
| * | | Remove unused rugged code that is currently on GitalyAlejandro Rodríguez2018-07-201-8/+0
* | | | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-231-0/+9
|\ \ \ \
| * | | | Add dummy Google Hangouts Chat integrationKukovskii Vladimir2018-07-141-0/+9
* | | | | Fix gitlab import project loadFrancisco Javier López2018-07-232-14/+18
* | | | | Merge branch 'rs-web_url-for-pipelines-and-jobs' into 'master'Douwe Maan2018-07-232-1/+9
|\ \ \ \ \
| * | | | | Ensure a job preloads the project's namespace to avoid N+1Robert Speicher2018-07-201-1/+1
| * | | | | Expose web_url attribute in PipelineBasic and JobBasicrs-web_url-for-pipelines-and-jobsRobert Speicher2018-07-181-0/+8
* | | | | | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-235-28/+29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-205-28/+29
* | | | | | Bring JsonLogger to CEStan Hu2018-07-201-0/+22
| |_|_|/ / |/| | | |
* | | | | Fixing bug with wiki ref in ProjectSearchResultsFrancisco Javier López2018-07-201-7/+12
* | | | | Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master'Kamil Trzciński2018-07-202-3/+4
|\ \ \ \ \
| * | | | | Fix passing a hash with string keys when fabricating a variableGrzegorz Bizon2018-07-191-1/+1
| * | | | | Fix deserializing yaml variables in imported projectsGrzegorz Bizon2018-07-191-2/+3
* | | | | | Merge branch 'zj-remove-refs-cleanup' into 'master'Kamil Trzciński2018-07-201-23/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove refs cleanup jobZeger-Jan van de Weg2018-07-191-23/+0
* | | | | | Merge branch 'zj-gitaly-migrate-old-migrations' into 'master'Sean McGivern2018-07-201-1/+0
|\ \ \ \ \ \
| * | | | | | MigrateProcessCommitWorkerJobs to use GitalyZeger-Jan van de Weg2018-07-191-1/+0
* | | | | | | Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-192-87/+6
| |_|_|_|_|/ |/| | | | |
* | | | | | Backport of gitlab-org/gitlab-ee!6137Valery Sizov2018-07-191-3/+18
* | | | | | Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-192-5/+8
* | | | | | Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'Rémy Coutable2018-07-192-0/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-192-0/+45
| |/ / / /
* | | | | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-191-6/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+9
| | |/ / | |/| |
* | | | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-191-4/+4
|\ \ \ \
| * | | | Use rugged to validate ref nameAhmad Hassan2018-07-191-4/+4
* | | | | Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-191-34/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-181-34/+0
* | | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-182-41/+29
| |_|/ / |/| | |
* | | | Fix serialization of LegacyDiffNoteJan Provaznik2018-07-181-1/+1
* | | | Fix filename for accelerated uploadsJan Provaznik2018-07-181-1/+11
* | | | Client implementation for Repository#new_commitsZeger-Jan van de Weg2018-07-183-50/+34
|/ / /
* | | Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' into...Douwe Maan2018-07-181-1/+24
|\ \ \
| * | | Improves remote message when a developer is unable to push in an empty reposi...27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-181-1/+24
* | | | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-183-152/+3
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-...jivl-dev-master-into-com-masterJose2018-07-171-1/+2
|\ \ \ \
| * \ \ \ Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-171-1/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | * | | Fix symlink vulnerability in project importStan Hu2018-07-171-1/+2
* | | | | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
|\ \ \ \ \
| * | | | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
* | | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-178-39/+131
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status